X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FQtx%2FCMakeLists.txt;h=d62b4e1c2bce7360477067dec105c3f5f1bf6b69;hb=f2376a3d416ad43c5ad000a92deb0801f71ff4c4;hp=b1a89f82bc0e1e52fcdbf4b52e86f0aa58a28f62;hpb=627194285d9b5354291d3a442b68b8740f114eda;p=modules%2Fgui.git

diff --git a/src/Qtx/CMakeLists.txt b/src/Qtx/CMakeLists.txt
old mode 100755
new mode 100644
index b1a89f82b..d62b4e1c2
--- a/src/Qtx/CMakeLists.txt
+++ b/src/Qtx/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2024  CEA, EDF, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 
@@ -33,7 +33,7 @@ SET(_link_LIBRARIES ${QT_LIBRARIES} ${OPENGL_LIBRARIES})
 # --- headers ---
 
 # header files / to be processed by moc
-SET(_moc_HEADERS   
+SET(_moc_HEADERS
   QtxAction.h
   QtxActionGroup.h
   QtxActionMenuMgr.h
@@ -53,6 +53,7 @@ SET(_moc_HEADERS
   QtxFontEdit.h
   QtxGridBox.h
   QtxGroupBox.h
+  QtxInfoPanel.h
   QtxIntSpinBox.h
   QtxIntSpinSlider.h
   QtxListAction.h
@@ -61,6 +62,7 @@ SET(_moc_HEADERS
   QtxMainWindow.h
   QtxMenu.h
   QtxMultiAction.h
+  QtxNotify.h
   QtxPagePrefMgr.h
   QtxPathDialog.h
   QtxPathEdit.h
@@ -68,20 +70,23 @@ SET(_moc_HEADERS
   QtxPopupMgr.h
   QtxRubberBand.h
   QtxSearchTool.h
-  QtxShortcutEdit.h
   QtxSlider.h
   QtxSplash.h
   QtxToolBar.h
+  QtxToolButton.h
   QtxToolTip.h
   QtxTreeView.h
   QtxValidator.h
-  QtxWebBrowser.h
   QtxWorkspace.h
   QtxWorkspaceAction.h
   QtxWorkstack.h
   QtxWorkstackAction.h
 )
 
+IF(SALOME_GUI_ENABLE_QTXWEBBROWSER)
+  SET(_moc_HEADERS ${_moc_HEADERS}  QtxWebBrowser.h)
+ENDIF()
+
 # obsolete files: not migrated to Qt4
 # _moc_HEADERS << QtxListBox.h QtxTable.h
 # TODO: migrate or remove?
@@ -91,6 +96,7 @@ SET(_other_HEADERS
   Qtx.h
   QtxEvalExpr.h
   QtxMap.h
+  QtxMsgHandler.h
   QtxPreferenceMgr.h
   QtxResourceMgr.h
   QtxTranslator.h
@@ -105,15 +111,17 @@ SET(qtx_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
 SET(_rcc_RESOURCES Qtx.qrc)
 
 # resource files / to be processed by lrelease
-SET(_ts_RESOURCES resources/Qtx_msg_fr.ts)
+SET(_ts_RESOURCES resources/Qtx_msg_fr.ts
+                  resources/Qtx_msg_ja.ts
+)
 
 # --- sources ---
 
-# sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
-
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / rcc wrappings
+QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
 
 # sources / static
 SET(_other_SOURCES
@@ -138,6 +146,7 @@ SET(_other_SOURCES
   QtxFontEdit.cxx
   QtxGridBox.cxx
   QtxGroupBox.cxx
+  QtxInfoPanel.cxx
   QtxIntSpinBox.cxx
   QtxIntSpinSlider.cxx
   QtxListAction.cxx
@@ -145,7 +154,9 @@ SET(_other_SOURCES
   QtxMRUAction.cxx
   QtxMainWindow.cxx
   QtxMenu.cxx
+  QtxMsgHandler.cxx
   QtxMultiAction.cxx
+  QtxNotify.cxx
   QtxPagePrefMgr.cxx
   QtxPathDialog.cxx
   QtxPathEdit.cxx
@@ -155,21 +166,24 @@ SET(_other_SOURCES
   QtxResourceMgr.cxx
   QtxRubberBand.cxx
   QtxSearchTool.cxx
-  QtxShortcutEdit.cxx
   QtxSlider.cxx
   QtxSplash.cxx
   QtxToolBar.cxx
+  QtxToolButton.cxx
   QtxToolTip.cxx
   QtxTranslator.cxx
   QtxTreeView.cxx
   QtxValidator.cxx
-  QtxWebBrowser.cxx
   QtxWorkspace.cxx
   QtxWorkspaceAction.cxx
   QtxWorkstack.cxx
   QtxWorkstackAction.cxx
 )
 
+IF(SALOME_GUI_ENABLE_QTXWEBBROWSER)
+  SET(_other_SOURCES ${_other_SOURCES}  QtxWebBrowser.cxx)
+ENDIF()
+
 # obsolete files: not migrated to Qt4
 # _other_SOURCES << QtxListBox.cxx QtxTable.cxx
 # TODO: migrate or remove?
@@ -184,4 +198,4 @@ TARGET_LINK_LIBRARIES(qtx ${_link_LIBRARIES})
 INSTALL(TARGETS qtx EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${qtx_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
\ No newline at end of file
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")