Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bos #40644][CEA](2024-T1) Feature search.
[modules/gui.git]
/
src
/
Qtx
/
CMakeLists.txt
diff --git
a/src/Qtx/CMakeLists.txt
b/src/Qtx/CMakeLists.txt
old mode 100755
(executable)
new mode 100644
(file)
index
099033e
..
d62b4e1
--- a/
src/Qtx/CMakeLists.txt
+++ b/
src/Qtx/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
14 CEA/DEN, EDF R&D
, OPEN CASCADE
+# Copyright (C) 2012-20
24 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
#
# 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
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-INCLUDE(UseQt
4
Ext)
+INCLUDE(UseQtExt)
# --- options ---
# --- options ---
@@
-33,7
+33,7
@@
SET(_link_LIBRARIES ${QT_LIBRARIES} ${OPENGL_LIBRARIES})
# --- headers ---
# header files / to be processed by moc
# --- headers ---
# header files / to be processed by moc
-SET(_moc_HEADERS
+SET(_moc_HEADERS
QtxAction.h
QtxActionGroup.h
QtxActionMenuMgr.h
QtxAction.h
QtxActionGroup.h
QtxActionMenuMgr.h
@@
-53,6
+53,7
@@
SET(_moc_HEADERS
QtxFontEdit.h
QtxGridBox.h
QtxGroupBox.h
QtxFontEdit.h
QtxGridBox.h
QtxGroupBox.h
+ QtxInfoPanel.h
QtxIntSpinBox.h
QtxIntSpinSlider.h
QtxListAction.h
QtxIntSpinBox.h
QtxIntSpinSlider.h
QtxListAction.h
@@
-61,6
+62,7
@@
SET(_moc_HEADERS
QtxMainWindow.h
QtxMenu.h
QtxMultiAction.h
QtxMainWindow.h
QtxMenu.h
QtxMultiAction.h
+ QtxNotify.h
QtxPagePrefMgr.h
QtxPathDialog.h
QtxPathEdit.h
QtxPagePrefMgr.h
QtxPathDialog.h
QtxPathEdit.h
@@
-68,20
+70,23
@@
SET(_moc_HEADERS
QtxPopupMgr.h
QtxRubberBand.h
QtxSearchTool.h
QtxPopupMgr.h
QtxRubberBand.h
QtxSearchTool.h
- QtxShortcutEdit.h
QtxSlider.h
QtxSplash.h
QtxToolBar.h
QtxSlider.h
QtxSplash.h
QtxToolBar.h
+ QtxToolButton.h
QtxToolTip.h
QtxTreeView.h
QtxValidator.h
QtxToolTip.h
QtxTreeView.h
QtxValidator.h
- QtxWebBrowser.h
QtxWorkspace.h
QtxWorkspaceAction.h
QtxWorkstack.h
QtxWorkstackAction.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?
# 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
Qtx.h
QtxEvalExpr.h
QtxMap.h
+ QtxMsgHandler.h
QtxPreferenceMgr.h
QtxResourceMgr.h
QtxTranslator.h
QtxPreferenceMgr.h
QtxResourceMgr.h
QtxTranslator.h
@@
-106,16
+112,16
@@
SET(_rcc_RESOURCES Qtx.qrc)
# resource files / to be processed by lrelease
SET(_ts_RESOURCES resources/Qtx_msg_fr.ts
# resource files / to be processed by lrelease
SET(_ts_RESOURCES resources/Qtx_msg_fr.ts
- resources/Qtx_msg_ja.ts
+
resources/Qtx_msg_ja.ts
)
# --- sources ---
)
# --- sources ---
-# sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
-
# sources / moc wrappings
# 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
# sources / static
SET(_other_SOURCES
@@
-140,6
+146,7
@@
SET(_other_SOURCES
QtxFontEdit.cxx
QtxGridBox.cxx
QtxGroupBox.cxx
QtxFontEdit.cxx
QtxGridBox.cxx
QtxGroupBox.cxx
+ QtxInfoPanel.cxx
QtxIntSpinBox.cxx
QtxIntSpinSlider.cxx
QtxListAction.cxx
QtxIntSpinBox.cxx
QtxIntSpinSlider.cxx
QtxListAction.cxx
@@
-147,7
+154,9
@@
SET(_other_SOURCES
QtxMRUAction.cxx
QtxMainWindow.cxx
QtxMenu.cxx
QtxMRUAction.cxx
QtxMainWindow.cxx
QtxMenu.cxx
+ QtxMsgHandler.cxx
QtxMultiAction.cxx
QtxMultiAction.cxx
+ QtxNotify.cxx
QtxPagePrefMgr.cxx
QtxPathDialog.cxx
QtxPathEdit.cxx
QtxPagePrefMgr.cxx
QtxPathDialog.cxx
QtxPathEdit.cxx
@@
-157,21
+166,24
@@
SET(_other_SOURCES
QtxResourceMgr.cxx
QtxRubberBand.cxx
QtxSearchTool.cxx
QtxResourceMgr.cxx
QtxRubberBand.cxx
QtxSearchTool.cxx
- QtxShortcutEdit.cxx
QtxSlider.cxx
QtxSplash.cxx
QtxToolBar.cxx
QtxSlider.cxx
QtxSplash.cxx
QtxToolBar.cxx
+ QtxToolButton.cxx
QtxToolTip.cxx
QtxTranslator.cxx
QtxTreeView.cxx
QtxValidator.cxx
QtxToolTip.cxx
QtxTranslator.cxx
QtxTreeView.cxx
QtxValidator.cxx
- QtxWebBrowser.cxx
QtxWorkspace.cxx
QtxWorkspaceAction.cxx
QtxWorkstack.cxx
QtxWorkstackAction.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?
# obsolete files: not migrated to Qt4
# _other_SOURCES << QtxListBox.cxx QtxTable.cxx
# TODO: migrate or remove?
@@
-186,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})
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}")