From 0834c45c900a572de853e8a7edae05a807e06bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 3 Aug 2017 08:09:44 +0000 Subject: [PATCH] Multi-Qt building git-svn-id: svn://db.shs.com.ru/libs@250 a8b55f48-bf90-11e4-a774-851b48703e85 --- CMakeLists.txt | 22 ++++++-- FindMinGW.cmake | 9 ++-- SDKMacros.cmake | 13 ++--- cd_utils/CMakeLists.txt | 10 ++-- piqt/CMakeLists.txt | 30 ++++++----- piqt_utils/CMakeLists.txt | 49 +++++++++-------- piqt_utils/piconnedit/CMakeLists.txt | 23 ++++---- piqt_utils/pidumper/CMakeLists.txt | 23 ++++---- piqt_utils/pidumper/pidumper.cpp | 4 ++ piqt_utils/piintrospector/CMakeLists.txt | 23 ++++---- piqt_utils/piintrospector/piintrospector.cpp | 4 ++ piqt_utils/piqt_connection_edit.cpp | 3 -- qad/CMakeLists.txt | 54 ++++++++++--------- qad/FindQAD.cmake | 11 ++-- qad/QtProject.cmake | 16 ------ qad/application/CMakeLists.txt | 3 +- qad/application/plugin/CMakeLists.txt | 2 +- qad/application/plugin/edockwidgetplugin.h | 6 ++- qad/application/plugin/emainwindowplugin.h | 6 ++- qad/application/plugin/historyviewplugin.h | 6 ++- qad/application/plugin/qad_application.cpp | 4 +- qad/application/plugin/qad_application.h | 4 +- qad/blockview/CMakeLists.txt | 3 +- qad/blockview/blockbusitem.h | 2 +- qad/blockview/blockeditor/CMakeLists.txt | 23 ++++---- qad/blockview/blockview.cpp | 1 + qad/blockview/plugin/CMakeLists.txt | 2 +- qad/blockview/plugin/blockviewplugin.h | 6 ++- qad/blockview/plugin/qad_blockview.cpp | 5 +- qad/blockview/plugin/qad_blockview.h | 4 +- qad/graphic/CMakeLists.txt | 3 +- qad/graphic/graphic.cpp | 2 +- qad/graphic/plugin/CMakeLists.txt | 2 +- qad/graphic/plugin/graphicplugin.h | 6 ++- qad/graphic/plugin/qad_graphic.cpp | 5 +- qad/graphic/plugin/qad_graphic.h | 4 +- qad/graphic/qpicalculator/CMakeLists.txt | 22 ++++---- qad/graphic/qpicalculator/main.cpp | 14 ++--- qad/graphic/qpicalculator/mainwindow.cpp | 5 ++ qad/sql_table/CMakeLists.txt | 3 +- qad/sql_table/plugin/CMakeLists.txt | 2 +- qad/sql_table/plugin/qad_sql_table.cpp | 2 + qad/sql_table/plugin/qad_sql_table.h | 4 +- qad/sql_table/plugin/sql_record_plugin.h | 6 ++- qad/sql_table/plugin/sql_table_plugin.h | 6 ++- qad/touch_widgets/CMakeLists.txt | 3 +- qad/touch_widgets/plugin/CMakeLists.txt | 2 +- qad/touch_widgets/plugin/touch_widgets.cpp | 5 +- qad/touch_widgets/plugin/touch_widgets.h | 4 +- .../plugin/touchbuttframeplugin.h | 6 ++- qad/touch_widgets/plugin/touchbuttonplugin.h | 6 ++- qad/touch_widgets/plugin/touchsliderplugin.h | 6 ++- qad/touch_widgets/touchbuttframe.h | 2 +- qad/utils/CMakeLists.txt | 3 +- qad/utils/plugin/CMakeLists.txt | 2 +- qad/utils/plugin/qad_utils.cpp | 3 ++ qad/utils/plugin/qad_utils.h | 5 +- qad/widgets/CMakeLists.txt | 3 +- qad/widgets/plugin/CMakeLists.txt | 2 +- qad/widgets/plugin/chardialogplugin.h | 6 ++- qad/widgets/plugin/clineeditplugin.h | 6 ++- qad/widgets/plugin/colorbuttonplugin.h | 6 ++- qad/widgets/plugin/ecomboboxplugin.h | 6 ++- qad/widgets/plugin/iconedlabelplugin.h | 6 ++- qad/widgets/plugin/qad_widgets.cpp | 5 +- qad/widgets/plugin/qad_widgets.h | 4 +- qad/widgets/plugin/qcodeeditplugin.h | 6 ++- qad/widgets/plugin/qipeditplugin.h | 6 ++- qad/widgets/plugin/qpiconfigplugin.h | 6 ++- qad/widgets/plugin/qpiconsoleplugin.h | 6 ++- qad/widgets/plugin/qpointeditplugin.h | 6 ++- qad/widgets/plugin/qrecteditplugin.h | 6 ++- qad/widgets/plugin/qvarianteditplugin.h | 6 ++- qad/widgets/plugin/shortcutsplugin.h | 6 ++- qad/widgets/plugin/spinsliderplugin.h | 6 ++- qcd_utils/CMakeLists.txt | 32 +++++------ qcd_utils/pult/CMakeLists.txt | 23 ++++---- qcd_utils/pult/main.cpp | 2 +- 78 files changed, 410 insertions(+), 249 deletions(-) delete mode 100644 qad/QtProject.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 9748a04..583f56a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) project(libs) set(LIBPROJECT 1) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/") -cmake_policy(SET CMP0017 OLD) +#cmake_policy(SET CMP0017 OLD) if(MINGW) find_package(MinGW REQUIRED) endif() @@ -48,21 +48,35 @@ endif() set(QAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/qad) +include(qad/QtWraps.cmake) +set(QtVersions) +foreach(_v ${_QT_VERSIONS_}) + option(Qt${_v} "Build for Qt${_v}" 1) + if (Qt${_v}) + #message("Qt${_v}") + list(APPEND QtVersions Qt${_v}) + endif() +endforeach() + add_subdirectory(pip) +message(STATUS "Building Qt-derived targets for ${QtVersions}") add_subdirectory(qad) -set(_DIRS piqt piqt_utils cd_utils qcd_utils) +set(_DIRS piqt piqt_utils qcd_utils) if (QGLVIEW) list(APPEND _DIRS qglview) endif() +foreach(_D ${_DIRS}) + list(APPEND QT_MULTILIB_LIST ${D}) +endforeach(_D) +list(INSERT _DIRS 0 cd_utils) foreach(_D ${_DIRS}) include_directories(${_D}) add_subdirectory(${_D}) endforeach(_D) if(WIN32) - get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) foreach(PIP_LT ${PIP_LIBS_TARGETS}) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/lib${PIP_LT}.dll" DESTINATION ${QTDIR}) + qt_install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/lib${PIP_LT}.dll" DESTINATION QtBin) endforeach() set(CMAKES "FindMinGW.cmake") install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) diff --git a/FindMinGW.cmake b/FindMinGW.cmake index c0c60dc..c113171 100644 --- a/FindMinGW.cmake +++ b/FindMinGW.cmake @@ -15,8 +15,11 @@ if(${MINGW}) #if(NOT ${MINGW_INCLUDE}) MINGW_INCLUDE = ${MINGW_DIR}/include find_library(MINGW_LIB m HINTS ${MINGW_BIN}/../lib ${MINGW_INCLUDE}/../lib) get_filename_component(MINGW_LIB ${MINGW_LIB} PATH) - message(STATUS "Found MinGW binary path = ${MINGW_BIN}") - message(STATUS "Found MinGW include path = ${MINGW_INCLUDE}") - message(STATUS "Found MinGW library path = ${MINGW_LIB}") + if (NOT _MGW_MSG) + set(_MGW_MSG 1 CACHE BOOL "msg_mingw" FORCE) + message(STATUS "Found MinGW binary path = ${MINGW_BIN}") + message(STATUS "Found MinGW include path = ${MINGW_INCLUDE}") + message(STATUS "Found MinGW library path = ${MINGW_LIB}") + endif() endif() endif(${MINGW}) diff --git a/SDKMacros.cmake b/SDKMacros.cmake index e0f1906..00f937c 100644 --- a/SDKMacros.cmake +++ b/SDKMacros.cmake @@ -6,17 +6,18 @@ macro(sdk_install _DIR _TARGET _H_FILES) #message("HFILES ${_H_FILES}") install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR}) endif() - install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB}) - install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN}) - get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) - install(TARGETS ${_TARGET} DESTINATION ${QTDIR}) + qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB}) + qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${_TARGET} DESTINATION QtBin) else() if (NOT _H_FILES STREQUAL "") install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${_DIR}) endif() - install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() + #message(STATUS "Install ${_TARGET} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${_TARGET} DESTINATION bin) + qt_install(TARGETS ${_TARGET} DESTINATION bin) + #message(STATUS "Install ${_TARGET} to local \"bin\"") endif() endmacro() diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt index 2420969..42f0fa7 100644 --- a/cd_utils/CMakeLists.txt +++ b/cd_utils/CMakeLists.txt @@ -28,10 +28,10 @@ target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY}) add_executable(cdutilstest "cdutilstest.cpp" "cdtest.h") target_link_libraries(cdutilstest ${PIP_LIBRARY} ${PROJECT_NAME}) message(STATUS "Building ${PROJECT_NAME}") -if (LIBPROJECT) - include(SDKMacros) - sdk_install("" "${PROJECT_NAME}" "${HDRS_UTILS}") -else() +#if (LIBPROJECT) +# include(SDKMacros) +# sdk_install("" "${PROJECT_NAME}" "${HDRS_UTILS}") +#else() if(LIB) if(WIN32) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) @@ -52,4 +52,4 @@ else() install(TARGETS ${PROJECT_NAME} DESTINATION bin) message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() -endif() +#endif() diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt index 52a89a7..a28b87b 100644 --- a/piqt/CMakeLists.txt +++ b/piqt/CMakeLists.txt @@ -1,6 +1,6 @@ project(piqt) cmake_minimum_required(VERSION 2.6) -cmake_policy(SET CMP0017 OLD) +#cmake_policy(SET CMP0017 OLD) if(NOT LIBPROJECT) find_package(PIP REQUIRED) option(LIB "System install" 0) @@ -11,36 +11,38 @@ if(NOT LIBPROJECT) endif() endif() find_package(QAD REQUIRED) +list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME}) +set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE) include_directories(${PIP_INCLUDES} ${QAD_INCLUDES}) -qt_project(${PROJECT_NAME} H CPP) -add_library(${PROJECT_NAME} SHARED ${H} ${CPP}) -set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY}) -target_link_libraries(${PROJECT_NAME} ${LIBS}) +file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") +find_qt(${QtVersions} Core Gui) +qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) +qt_add_library(${PROJECT_NAME} SHARED out_CPP) +qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets) message(STATUS "Building ${PROJECT_NAME}") if(LIBPROJECT) include(SDKMacros) - sdk_install("pip" "${PROJECT_NAME}" "${H}") + sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}") else() if(LIB) if(WIN32) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) - install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/pip) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) - get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) - install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) + install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) else() if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() set(CMAKE_INSTALL_PREFIX /usr) endif() - install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) - install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() endif() diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index 315a0e1..1916569 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -1,6 +1,6 @@ project(piqt_utils) cmake_minimum_required(VERSION 2.6) -cmake_policy(SET CMP0017 OLD) +#cmake_policy(SET CMP0017 OLD) if(LIBPROJECT) include(PIPMacros) include(SDKMacros) @@ -13,21 +13,28 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") endif() endif() -find_package(QAD REQUIRED) -include_directories(${PIP_INCLUDES} ${QAD_INCLUDES}) -qt_project(${PROJECT_NAME} H CPP) -pip_code_model(CCM "../pip/src_main/io/piiodevice.h" "../pip/src_main/io/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es") +set(LIBTYPE SHARED) if(DEFINED ENV{QNX_HOST}) - add_library(${PROJECT_NAME} STATIC ${H} ${CPP} ${CCM}) -else() - add_library(${PROJECT_NAME} SHARED ${H} ${CPP} ${CCM}) + set(LIBTYPE STATIC) endif() -set(LIBS ${QAD_WIDGETS_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_BLOCKVIEW_LIBRARY} ${PIP_LIBRARY}) -target_link_libraries(${PROJECT_NAME} ${LIBS}) +find_package(QAD REQUIRED) +list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME}) +set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE) +include_directories(${PIP_INCLUDES} ${QAD_INCLUDES}) +file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") +pip_code_model(CCM "../pip/src_main/io/piiodevice.h" "../pip/src_main/io/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es") +find_qt(${QtVersions} Core Gui) +qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) +qt_add_library(${PROJECT_NAME} ${LIBTYPE} out_CPP CCM) +qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets qad_blockview) message(STATUS "Building ${PROJECT_NAME}") if (LIBPROJECT) - add_dependencies(piqt_utils pip_cmg) + foreach(_v ${_QT_VERSIONS_}) + if (LOCAL_FOUND${_v}) + add_dependencies(piqt_utils${_v} pip_cmg) + endif() + endforeach() endif() if (NOT DEFINED ENV{QNX_HOST}) @@ -36,30 +43,28 @@ if (NOT DEFINED ENV{QNX_HOST}) add_subdirectory(piintrospector) endif() -if (LIBPROJECT) - sdk_install("pip" "${PROJECT_NAME}" "${H}") +if(LIBPROJECT) + sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}") else() if(LIB) if(WIN32) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) - install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/pip) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) - get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) - install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) + install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) else() if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() set(CMAKE_INSTALL_PREFIX /usr) - install(TARGETS ${_TARGETS} DESTINATION /usr/bin) endif() - install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) - install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() endif() diff --git a/piqt_utils/piconnedit/CMakeLists.txt b/piqt_utils/piconnedit/CMakeLists.txt index eb474bb..337cc52 100644 --- a/piqt_utils/piconnedit/CMakeLists.txt +++ b/piqt_utils/piconnedit/CMakeLists.txt @@ -1,21 +1,22 @@ -qt_project(piconnedit PICONNEDIT_H PICONNEDIT_CPP) -add_executable(${PROJECT_NAME} WIN32 ${PICONNEDIT_H} ${PICONNEDIT_CPP}) -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} piqt_utils) -target_link_libraries(${PROJECT_NAME} ${LIBS}) +project(piconnedit) +file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") +find_qt(${QtVersions} Core Gui) +qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) +qt_add_executable(${PROJECT_NAME} WIN32 out_CPP) +qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets piqt_utils) message(STATUS "Building ${PROJECT_NAME}") if(LIB) if(WIN32) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) else() if(APPLE) - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) endif() endif() - message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") + #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) - message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") + qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() - diff --git a/piqt_utils/pidumper/CMakeLists.txt b/piqt_utils/pidumper/CMakeLists.txt index 1bcb386..1507744 100644 --- a/piqt_utils/pidumper/CMakeLists.txt +++ b/piqt_utils/pidumper/CMakeLists.txt @@ -1,21 +1,22 @@ -qt_project(pidumper PIDUMPER_H PIDUMPER_CPP) -add_executable(${PROJECT_NAME} WIN32 ${PIDUMPER_H} ${PIDUMPER_CPP}) -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} piqt_utils) -target_link_libraries(${PROJECT_NAME} ${LIBS}) +project(pidumper) +file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") +find_qt(${QtVersions} Core Gui) +qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) +qt_add_executable(${PROJECT_NAME} WIN32 out_CPP) +qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets piqt_utils) message(STATUS "Building ${PROJECT_NAME}") if(LIB) if(WIN32) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) else() if(APPLE) - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) endif() endif() - message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") + #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) - message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") + qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() - diff --git a/piqt_utils/pidumper/pidumper.cpp b/piqt_utils/pidumper/pidumper.cpp index 0948acb..4cfb522 100644 --- a/piqt_utils/pidumper/pidumper.cpp +++ b/piqt_utils/pidumper/pidumper.cpp @@ -10,7 +10,11 @@ PIDumper::PIDumper(QWidget * parent): QMainWindow(parent) { setupUi(this); +#if QT_VERSION >= 0x050000 + treeDump->header()->setSectionResizeMode(QHeaderView::ResizeToContents); +#else treeDump->header()->setResizeMode(QHeaderView::ResizeToContents); +#endif } diff --git a/piqt_utils/piintrospector/CMakeLists.txt b/piqt_utils/piintrospector/CMakeLists.txt index 0f48713..8076bfc 100644 --- a/piqt_utils/piintrospector/CMakeLists.txt +++ b/piqt_utils/piintrospector/CMakeLists.txt @@ -1,21 +1,22 @@ -qt_project(piintrospector PIINTROSPECTOR_H PIINTROSPECTOR_CPP) -add_executable(${PROJECT_NAME} WIN32 ${PIINTROSPECTOR_H} ${PIINTROSPECTOR_CPP}) -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} piqt_utils) -target_link_libraries(${PROJECT_NAME} ${LIBS}) +project(piintrospector) +file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") +find_qt(${QtVersions} Core Gui) +qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) +qt_add_executable(${PROJECT_NAME} WIN32 out_CPP) +qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets piqt_utils) message(STATUS "Building ${PROJECT_NAME}") if(LIB) if(WIN32) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) else() if(APPLE) - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) endif() endif() - message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") + #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) - message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") + qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() - diff --git a/piqt_utils/piintrospector/piintrospector.cpp b/piqt_utils/piintrospector/piintrospector.cpp index baf31f4..c956135 100644 --- a/piqt_utils/piintrospector/piintrospector.cpp +++ b/piqt_utils/piintrospector/piintrospector.cpp @@ -7,7 +7,11 @@ QPIIntrospector::QPIIntrospector(QWidget * parent): QMainWindow(parent), peer("__introspection_client__") { setupUi(this); +#if QT_VERSION >= 0x050000 + tree->header()->setSectionResizeMode(QHeaderView::ResizeToContents); +#else tree->header()->setResizeMode(QHeaderView::ResizeToContents); +#endif CONNECTU(&peer, dataReceivedEvent, this, peerReceived) startTimer(100); } diff --git a/piqt_utils/piqt_connection_edit.cpp b/piqt_utils/piqt_connection_edit.cpp index 4977e15..b3fff44 100644 --- a/piqt_utils/piqt_connection_edit.cpp +++ b/piqt_utils/piqt_connection_edit.cpp @@ -4,9 +4,6 @@ #include "piqt_highlighter.h" #include "piqt.h" #include "picodeinfo.h" -#include -#include -#include #include #include diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index c63fdbd..1d40563 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -1,8 +1,7 @@ project(qad) cmake_minimum_required(VERSION 2.6) -cmake_policy(SET CMP0017 OLD) -find_package(Qt4 REQUIRED) -include(QtProject.cmake) +#cmake_policy(SET CMP0017 OLD) +#find_package(Qt4 REQUIRED) if (LIBPROJECT) include(../SDKMacros.cmake) else() @@ -35,7 +34,7 @@ if (NOT LIBPROJECT) message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() endif() -set(CMAKES "FindQAD.cmake" "QtProject.cmake") +set(CMAKES "FindQAD.cmake" "QtWraps.cmake") install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) macro(qad_install _TARGET _H_FILES) @@ -48,45 +47,46 @@ macro(qad_install _TARGET _H_FILES) #message("HFILES ${_H_FILES}") install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/qad) endif() - install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB}) - install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN}) - get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) - install(TARGETS ${_TARGET} DESTINATION ${QTDIR}) + qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB}) + qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${_TARGET} DESTINATION QtBin) else() if(NOT _H_FILES STREQUAL "") install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) endif() - install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() else() - install(TARGETS ${_TARGET} DESTINATION bin) + qt_install(TARGETS ${_TARGET} DESTINATION bin) endif() endif() endmacro() -macro(qad_plugin NAME _LIBS) - project(qad_${NAME}_plugin) +macro(qad_plugin NAME _MODULES _LIBS) + set(PROJ_NAME qad_${NAME}_plugin) include_directories("..") - set(LIBS ${_${NAME}_PLUGIN_LIBS} qad_${NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDESIGNER_LIBRARY} "${_LIBS}") #message(${_${NAME}_PLUGIN_LIBS}) add_definitions(-DQT_PLUGIN) add_definitions(-DQT_NO_DEBUG) add_definitions(-DQT_SHARED) add_definitions(-DQDESIGNER_EXPORT_WIDGETS) - file(GLOB PMOCS "./*.h") - file(GLOB PCPPS "./*.cpp") - qt4_wrap_cpp(PCMOCS ${PMOCS} OPTIONS -nw) - add_library(${PROJECT_NAME} SHARED ${PCMOCS} ${PCPPS} ${PMOCS}) - target_link_libraries(${PROJECT_NAME} ${LIBS}) - install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer) + file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") + find_qt(${QtVersions} Core Designer ${_MODULES}) + qt_wrap(${SRC} CPPS out_CPP QMS out_QM) + qt_add_library(${PROJ_NAME} SHARED out_CPP) + qt_target_link_libraries(${PROJ_NAME} ${_LIBS} qad_${NAME} ${_${NAME}_PLUGIN_LIBS}) + qt_install(TARGETS ${PROJ_NAME} DESTINATION QtPlugins/designer) endmacro() -macro(qad_project NAME _LIBS) - qt_project(qad_${NAME} _H _CPP) - add_library(qad_${NAME} SHARED ${_H} ${_CPP}) - target_link_libraries(qad_${NAME} ${_LIBS}) - message(STATUS "Building ${PROJECT_NAME}") - qad_install(${PROJECT_NAME} "${_H}") +macro(qad_project NAME _MODULES _LIBS) + set(PROJ_NAME qad_${NAME}) + file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") + find_qt(${QtVersions} Core ${_MODULES}) + qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) + qt_add_library(${PROJ_NAME} SHARED out_CPP) + qt_target_link_libraries(${PROJ_NAME} ${_LIBS}) + qad_install(${PROJ_NAME} "${out_HDR}") + message(STATUS "Building ${PROJ_NAME}") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin") set(_${NAME}_PLUGIN_LIBS "${_LIBS}") add_subdirectory(plugin) @@ -94,6 +94,10 @@ macro(qad_project NAME _LIBS) endmacro() set(DIRS utils widgets application blockview graphic sql_table touch_widgets) +foreach(D ${DIRS}) + list(APPEND QT_MULTILIB_LIST qad_${D}) +endforeach(D) +set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE) foreach(D ${DIRS}) include_directories(${D}) add_subdirectory(${D}) diff --git a/qad/FindQAD.cmake b/qad/FindQAD.cmake index 1ffb48b..2099e50 100644 --- a/qad/FindQAD.cmake +++ b/qad/FindQAD.cmake @@ -1,5 +1,5 @@ if(NOT LIBPROJECT) - include(QtProject) + include(QtWraps) endif() set(_SEARCH_DIR) if(WIN32) @@ -24,10 +24,15 @@ foreach(_Q ${_QAD_LIBS}) set(QAD_${_QU}_LIBRARY qad_${_Q}) list(APPEND QAD_INCLUDES ${QAD_DIR}/${_Q}) else() - find_library(QAD_${_QU}_LIBRARY qad_${_Q} ${_SEARCH_DIR}) + foreach(_v ${_QT_VERSIONS_}) + find_library(QAD${_v}_${_QU}_LIBRARY qad_${_Q}${_v} ${_SEARCH_DIR}) + endforeach() endif() #message(STATUS "Library ${_Q} (${_QU}) -> ${QAD_${_QU}_LIBRARY} found in ${_SEARCH_DIR}") endforeach() if(NOT LIBPROJECT) - message(STATUS "Found QAD") + if (NOT _QAD_MSG) + set(_QAD_MSG 1 CACHE BOOL "msg_qad" FORCE) + message(STATUS "Found QAD") + endif() endif() diff --git a/qad/QtProject.cmake b/qad/QtProject.cmake deleted file mode 100644 index cf6311c..0000000 --- a/qad/QtProject.cmake +++ /dev/null @@ -1,16 +0,0 @@ -macro(qt_project NAME _H_OUT _CPP_OUT) - project(${NAME}) - find_package(Qt4 REQUIRED) - include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES}) - file(GLOB ${_H_OUT} "./*.h") - file(GLOB CPPS_${NAME} "./*.cpp") - file(GLOB UIS_${NAME} "./*.ui") - file(GLOB RES_${NAME} "./*.qrc") - qt4_wrap_ui(CUIS_${NAME} ${UIS_${NAME}}) - qt4_wrap_cpp(CMOCS_${NAME} ${${_H_OUT}} OPTIONS -nw) - qt4_add_resources(CRES_${NAME} ${RES_${NAME}}) - set(${_CPP_OUT} ${CPPS_${NAME}}) - list(APPEND ${_CPP_OUT} ${CUIS_${NAME}}) - list(APPEND ${_CPP_OUT} ${CMOCS_${NAME}}) - list(APPEND ${_CPP_OUT} ${CRES_${NAME}}) -endmacro() diff --git a/qad/application/CMakeLists.txt b/qad/application/CMakeLists.txt index 72e9256..1c3f057 100644 --- a/qad/application/CMakeLists.txt +++ b/qad/application/CMakeLists.txt @@ -1,2 +1 @@ -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets) -qad_project(application "${LIBS}") +qad_project(application "Gui;Widgets" "qad_widgets") diff --git a/qad/application/plugin/CMakeLists.txt b/qad/application/plugin/CMakeLists.txt index 09f97dd..326c825 100644 --- a/qad/application/plugin/CMakeLists.txt +++ b/qad/application/plugin/CMakeLists.txt @@ -1 +1 @@ -qad_plugin(application "") +qad_plugin(application "Gui;Widgets" "") diff --git a/qad/application/plugin/edockwidgetplugin.h b/qad/application/plugin/edockwidgetplugin.h index fed7ce1..99c376c 100644 --- a/qad/application/plugin/edockwidgetplugin.h +++ b/qad/application/plugin/edockwidgetplugin.h @@ -1,7 +1,11 @@ #ifndef EDOCKWIDGETPLUGIN_H #define EDOCKWIDGETPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class EDockWidgetPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/application/plugin/emainwindowplugin.h b/qad/application/plugin/emainwindowplugin.h index e6da131..ebf9e57 100644 --- a/qad/application/plugin/emainwindowplugin.h +++ b/qad/application/plugin/emainwindowplugin.h @@ -1,7 +1,11 @@ #ifndef EMAINWINDOWPLUGIN_H #define EMAINWINDOWPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class EMainWindowPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/application/plugin/historyviewplugin.h b/qad/application/plugin/historyviewplugin.h index b3a2fb0..b930f93 100644 --- a/qad/application/plugin/historyviewplugin.h +++ b/qad/application/plugin/historyviewplugin.h @@ -1,7 +1,11 @@ #ifndef HISTORYVIEWPLUGIN_H #define HISTORYVIEWPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class HistoryViewPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/application/plugin/qad_application.cpp b/qad/application/plugin/qad_application.cpp index cc2e5c0..61d1067 100644 --- a/qad/application/plugin/qad_application.cpp +++ b/qad/application/plugin/qad_application.cpp @@ -1,7 +1,7 @@ +#include "qad_application.h" #include "edockwidgetplugin.h" #include "emainwindowplugin.h" #include "historyviewplugin.h" -#include "qad_application.h" QADApplication::QADApplication(QObject * parent): QObject(parent) { @@ -16,4 +16,6 @@ QList QADApplication::customWidgets() const { } +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN2(qad_graphic_plugin, QADApplication) +#endif diff --git a/qad/application/plugin/qad_application.h b/qad/application/plugin/qad_application.h index 7e8dcef..5ccdcbd 100644 --- a/qad/application/plugin/qad_application.h +++ b/qad/application/plugin/qad_application.h @@ -8,7 +8,9 @@ class QADApplication: public QObject, public QDesignerCustomWidgetCollectionInte { Q_OBJECT Q_INTERFACES(QDesignerCustomWidgetCollectionInterface) - +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "qad.application") +#endif public: explicit QADApplication(QObject * parent = 0); virtual QList customWidgets() const; diff --git a/qad/blockview/CMakeLists.txt b/qad/blockview/CMakeLists.txt index 7ee2606..60f2c17 100644 --- a/qad/blockview/CMakeLists.txt +++ b/qad/blockview/CMakeLists.txt @@ -1,3 +1,2 @@ -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils) -qad_project(blockview "${LIBS}") +qad_project(blockview "Gui;Widgets" "qad_utils;qad_widgets") add_subdirectory(blockeditor) \ No newline at end of file diff --git a/qad/blockview/blockbusitem.h b/qad/blockview/blockbusitem.h index 2552418..c680ef4 100644 --- a/qad/blockview/blockbusitem.h +++ b/qad/blockview/blockbusitem.h @@ -5,7 +5,7 @@ class BlockBusItem: public QGraphicsObject, public PropertyStorage { - //Q_OBJECT + Q_OBJECT Q_INTERFACES(QGraphicsItem) //Q_PROPERTY(double width READ width WRITE setWidth) friend class BlockView; diff --git a/qad/blockview/blockeditor/CMakeLists.txt b/qad/blockview/blockeditor/CMakeLists.txt index f2d4801..773fa1d 100644 --- a/qad/blockview/blockeditor/CMakeLists.txt +++ b/qad/blockview/blockeditor/CMakeLists.txt @@ -1,21 +1,22 @@ -qt_project(blockeditor BLOCKEDITOR_H BLOCKEDITOR_H) -add_executable(${PROJECT_NAME} WIN32 ${BLOCKEDITOR_H} ${BLOCKEDITOR_H}) -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils qad_blockview) -target_link_libraries(${PROJECT_NAME} ${LIBS}) +project(blockeditor) +file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") +find_qt(${QtVersions} Core Gui Widgets) +qt_wrap(${SRC} CPPS out_CPP QMS out_QM) +qt_add_executable(${PROJECT_NAME} WIN32 out_CPP) +qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_blockview) message(STATUS "Building ${PROJECT_NAME}") if(LIB) if(WIN32) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) else() if(APPLE) - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) endif() endif() - message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") + #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) - message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") + qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() - diff --git a/qad/blockview/blockview.cpp b/qad/blockview/blockview.cpp index e962989..8ec97b5 100644 --- a/qad/blockview/blockview.cpp +++ b/qad/blockview/blockview.cpp @@ -7,6 +7,7 @@ #include #include #include +#include const QString _BlockView_Mime_ = "_BlockView_copypaste_"; diff --git a/qad/blockview/plugin/CMakeLists.txt b/qad/blockview/plugin/CMakeLists.txt index 15ccc7a..fce055f 100644 --- a/qad/blockview/plugin/CMakeLists.txt +++ b/qad/blockview/plugin/CMakeLists.txt @@ -1 +1 @@ -qad_plugin(blockview "") +qad_plugin(blockview "Gui;Widgets" "") diff --git a/qad/blockview/plugin/blockviewplugin.h b/qad/blockview/plugin/blockviewplugin.h index 798c154..e5f49a1 100644 --- a/qad/blockview/plugin/blockviewplugin.h +++ b/qad/blockview/plugin/blockviewplugin.h @@ -1,7 +1,11 @@ #ifndef BLOCKVIEWPLUGIN_H #define BLOCKVIEWPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class BlockViewPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/blockview/plugin/qad_blockview.cpp b/qad/blockview/plugin/qad_blockview.cpp index b479558..4bd984e 100644 --- a/qad/blockview/plugin/qad_blockview.cpp +++ b/qad/blockview/plugin/qad_blockview.cpp @@ -1,5 +1,5 @@ -#include "blockviewplugin.h" #include "qad_blockview.h" +#include "blockviewplugin.h" QADBlockView::QADBlockView(QObject * parent): QObject(parent) { @@ -11,4 +11,7 @@ QList QADBlockView::customWidgets() const { return m_widgets; } + +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN2(qad_graphic_plugin, QADBlockView) +#endif diff --git a/qad/blockview/plugin/qad_blockview.h b/qad/blockview/plugin/qad_blockview.h index 5063596..2645d92 100644 --- a/qad/blockview/plugin/qad_blockview.h +++ b/qad/blockview/plugin/qad_blockview.h @@ -8,7 +8,9 @@ class QADBlockView: public QObject, public QDesignerCustomWidgetCollectionInterf { Q_OBJECT Q_INTERFACES(QDesignerCustomWidgetCollectionInterface) - +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "qad.blockview") +#endif public: explicit QADBlockView(QObject * parent = 0); virtual QList customWidgets() const; diff --git a/qad/graphic/CMakeLists.txt b/qad/graphic/CMakeLists.txt index 2d28961..8c513ed 100644 --- a/qad/graphic/CMakeLists.txt +++ b/qad/graphic/CMakeLists.txt @@ -1,3 +1,2 @@ -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} qad_widgets qad_utils) -qad_project(graphic "${LIBS}") +qad_project(graphic "Gui;Widgets;OpenGL" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}") add_subdirectory(qpicalculator) \ No newline at end of file diff --git a/qad/graphic/graphic.cpp b/qad/graphic/graphic.cpp index 71e9d07..c6d76ea 100644 --- a/qad/graphic/graphic.cpp +++ b/qad/graphic/graphic.cpp @@ -2,7 +2,7 @@ #include "ui_graphic.h" #include "ui_graphic_conf.h" #if QT_VERSION >= 0x050100 -# include +//# include #endif diff --git a/qad/graphic/plugin/CMakeLists.txt b/qad/graphic/plugin/CMakeLists.txt index 61032be..fea0294 100644 --- a/qad/graphic/plugin/CMakeLists.txt +++ b/qad/graphic/plugin/CMakeLists.txt @@ -1 +1 @@ -qad_plugin(graphic "") +qad_plugin(graphic "Gui;Widgets;OpenGL" "") diff --git a/qad/graphic/plugin/graphicplugin.h b/qad/graphic/plugin/graphicplugin.h index 9d1bc2e..0bc0161 100644 --- a/qad/graphic/plugin/graphicplugin.h +++ b/qad/graphic/plugin/graphicplugin.h @@ -1,7 +1,11 @@ #ifndef GRAPHICPLUGIN_H #define GRAPHICPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class GraphicPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/graphic/plugin/qad_graphic.cpp b/qad/graphic/plugin/qad_graphic.cpp index 391255c..4dd23cd 100644 --- a/qad/graphic/plugin/qad_graphic.cpp +++ b/qad/graphic/plugin/qad_graphic.cpp @@ -1,5 +1,5 @@ -#include "graphicplugin.h" #include "qad_graphic.h" +#include "graphicplugin.h" QADGraphic::QADGraphic(QObject * parent): QObject(parent) { @@ -11,4 +11,7 @@ QList QADGraphic::customWidgets() const { return m_widgets; } + +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN2(qad_graphic_plugin, QADGraphic) +#endif diff --git a/qad/graphic/plugin/qad_graphic.h b/qad/graphic/plugin/qad_graphic.h index 0bda0bb..07098fa 100644 --- a/qad/graphic/plugin/qad_graphic.h +++ b/qad/graphic/plugin/qad_graphic.h @@ -8,7 +8,9 @@ class QADGraphic: public QObject, public QDesignerCustomWidgetCollectionInterfac { Q_OBJECT Q_INTERFACES(QDesignerCustomWidgetCollectionInterface) - +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "qad.graphic") +#endif public: explicit QADGraphic(QObject * parent = 0); virtual QList customWidgets() const; diff --git a/qad/graphic/qpicalculator/CMakeLists.txt b/qad/graphic/qpicalculator/CMakeLists.txt index f31f5eb..731dae3 100644 --- a/qad/graphic/qpicalculator/CMakeLists.txt +++ b/qad/graphic/qpicalculator/CMakeLists.txt @@ -1,21 +1,23 @@ -qt_project(qpicalc QPICALC_H QPICALC_H) -add_executable(${PROJECT_NAME} WIN32 ${QPICALC_H} ${QPICALC_H}) -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils qad_graphic) -target_link_libraries(${PROJECT_NAME} ${LIBS}) +project(qpicalc) +file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") +find_qt(${QtVersions} Core Gui Widgets) +qt_wrap(${SRC} CPPS out_CPP QMS out_QM) +qt_add_executable(${PROJECT_NAME} WIN32 out_CPP) +qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_graphic) message(STATUS "Building ${PROJECT_NAME}") if(LIB) if(WIN32) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) else() if(APPLE) - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) endif() endif() - message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") + #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) - message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") + qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() diff --git a/qad/graphic/qpicalculator/main.cpp b/qad/graphic/qpicalculator/main.cpp index 6e7efd9..2e6cafd 100644 --- a/qad/graphic/qpicalculator/main.cpp +++ b/qad/graphic/qpicalculator/main.cpp @@ -1,10 +1,10 @@ -#include +#include #include "mainwindow.h" -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - MainWindow w; - w.show(); - return a.exec(); + +int main(int argc, char *argv[]) { + QApplication a(argc, argv); + MainWindow w; + w.show(); + return a.exec(); } diff --git a/qad/graphic/qpicalculator/mainwindow.cpp b/qad/graphic/qpicalculator/mainwindow.cpp index e60d01c..8879dd5 100644 --- a/qad/graphic/qpicalculator/mainwindow.cpp +++ b/qad/graphic/qpicalculator/mainwindow.cpp @@ -5,8 +5,13 @@ MainWindow::MainWindow(QWidget * parent): QMainWindow(parent), Ui::MainWindow() setupUi(this); active_ = false; lineInput->setFocus(); +#if QT_VERSION >= 0x050000 + treeGraphics->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents); + treeGraphics->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents); +#else treeGraphics->header()->setResizeMode(0, QHeaderView::ResizeToContents); treeGraphics->header()->setResizeMode(1, QHeaderView::ResizeToContents); +#endif npal = epal = lineInput->palette(); epal.setColor(lineInput->backgroundRole(), QColor(Qt::red).lighter(150)); connect(&session, SIGNAL(loading(QPIConfig & )), this, SLOT(loading(QPIConfig & ))); diff --git a/qad/sql_table/CMakeLists.txt b/qad/sql_table/CMakeLists.txt index 9789a1c..c7f7282 100644 --- a/qad/sql_table/CMakeLists.txt +++ b/qad/sql_table/CMakeLists.txt @@ -1,2 +1 @@ -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY} qad_widgets qad_utils) -qad_project(sql_table "${LIBS}") +qad_project(sql_table "Gui;Widgets;Sql" "qad_utils;qad_widgets") diff --git a/qad/sql_table/plugin/CMakeLists.txt b/qad/sql_table/plugin/CMakeLists.txt index 65de9df..d6e9378 100644 --- a/qad/sql_table/plugin/CMakeLists.txt +++ b/qad/sql_table/plugin/CMakeLists.txt @@ -1 +1 @@ -qad_plugin(sql_table "") +qad_plugin(sql_table "Gui;Widgets;Sql" "") diff --git a/qad/sql_table/plugin/qad_sql_table.cpp b/qad/sql_table/plugin/qad_sql_table.cpp index 1d4704e..795bfb6 100644 --- a/qad/sql_table/plugin/qad_sql_table.cpp +++ b/qad/sql_table/plugin/qad_sql_table.cpp @@ -14,4 +14,6 @@ QList QADSQLTable::customWidgets() const { } +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN2(qad_sql_table_plugin, QADSQLTable) +#endif diff --git a/qad/sql_table/plugin/qad_sql_table.h b/qad/sql_table/plugin/qad_sql_table.h index 64009eb..bb59554 100644 --- a/qad/sql_table/plugin/qad_sql_table.h +++ b/qad/sql_table/plugin/qad_sql_table.h @@ -8,7 +8,9 @@ class QADSQLTable: public QObject, public QDesignerCustomWidgetCollectionInterfa { Q_OBJECT Q_INTERFACES(QDesignerCustomWidgetCollectionInterface) - +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "qad.sql_table") +#endif public: explicit QADSQLTable(QObject * parent = 0); virtual QList customWidgets() const; diff --git a/qad/sql_table/plugin/sql_record_plugin.h b/qad/sql_table/plugin/sql_record_plugin.h index 2504493..6bd197d 100644 --- a/qad/sql_table/plugin/sql_record_plugin.h +++ b/qad/sql_table/plugin/sql_record_plugin.h @@ -1,7 +1,11 @@ #ifndef SQLRECORDPLUGIN_H #define SQLRECORDPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class SQLRecordPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/sql_table/plugin/sql_table_plugin.h b/qad/sql_table/plugin/sql_table_plugin.h index 671bfdf..6dd0a44 100644 --- a/qad/sql_table/plugin/sql_table_plugin.h +++ b/qad/sql_table/plugin/sql_table_plugin.h @@ -1,7 +1,11 @@ #ifndef SQLTABLEPLUGIN_H #define SQLTABLEPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class SQLTablePlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/touch_widgets/CMakeLists.txt b/qad/touch_widgets/CMakeLists.txt index 3d35da3..1140e08 100644 --- a/qad/touch_widgets/CMakeLists.txt +++ b/qad/touch_widgets/CMakeLists.txt @@ -1,2 +1 @@ -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -qad_project(touch_widgets "${LIBS}") +qad_project(touch_widgets "Gui;Widgets" "") diff --git a/qad/touch_widgets/plugin/CMakeLists.txt b/qad/touch_widgets/plugin/CMakeLists.txt index 879009e..558030d 100644 --- a/qad/touch_widgets/plugin/CMakeLists.txt +++ b/qad/touch_widgets/plugin/CMakeLists.txt @@ -1 +1 @@ -qad_plugin(touch_widgets "") +qad_plugin(touch_widgets "Gui;Widgets" "") diff --git a/qad/touch_widgets/plugin/touch_widgets.cpp b/qad/touch_widgets/plugin/touch_widgets.cpp index fbfc43c..b3e20b5 100644 --- a/qad/touch_widgets/plugin/touch_widgets.cpp +++ b/qad/touch_widgets/plugin/touch_widgets.cpp @@ -1,7 +1,7 @@ +#include "touch_widgets.h" #include "touchsliderplugin.h" #include "touchbuttframeplugin.h" #include "touchbuttonplugin.h" -#include "touch_widgets.h" TW::TW(QObject *parent) : QObject(parent) @@ -16,4 +16,7 @@ QList TW::customWidgets() const return m_widgets; } + +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN2(twplugin, TW) +#endif diff --git a/qad/touch_widgets/plugin/touch_widgets.h b/qad/touch_widgets/plugin/touch_widgets.h index e56646b..c968bd6 100644 --- a/qad/touch_widgets/plugin/touch_widgets.h +++ b/qad/touch_widgets/plugin/touch_widgets.h @@ -8,7 +8,9 @@ class TW : public QObject, public QDesignerCustomWidgetCollectionInterface { Q_OBJECT Q_INTERFACES(QDesignerCustomWidgetCollectionInterface) - +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "qad.touch_widgets") +#endif public: explicit TW(QObject *parent = 0); diff --git a/qad/touch_widgets/plugin/touchbuttframeplugin.h b/qad/touch_widgets/plugin/touchbuttframeplugin.h index 11f2d04..95737aa 100644 --- a/qad/touch_widgets/plugin/touchbuttframeplugin.h +++ b/qad/touch_widgets/plugin/touchbuttframeplugin.h @@ -1,7 +1,11 @@ #ifndef TOUCHBUTTFRAMEPLUGIN_H #define TOUCHBUTTFRAMEPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class TouchButtFramePlugin : public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/touch_widgets/plugin/touchbuttonplugin.h b/qad/touch_widgets/plugin/touchbuttonplugin.h index bb75c89..fbc8592 100644 --- a/qad/touch_widgets/plugin/touchbuttonplugin.h +++ b/qad/touch_widgets/plugin/touchbuttonplugin.h @@ -1,7 +1,11 @@ #ifndef TOUCHBUTTONPLUGIN_H #define TOUCHBUTTONPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class TouchButtonPlugin : public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/touch_widgets/plugin/touchsliderplugin.h b/qad/touch_widgets/plugin/touchsliderplugin.h index 25aa898..b574986 100644 --- a/qad/touch_widgets/plugin/touchsliderplugin.h +++ b/qad/touch_widgets/plugin/touchsliderplugin.h @@ -1,7 +1,11 @@ #ifndef TOUCHSLIDERPLUGIN_H #define TOUCHSLIDERPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class TouchSliderPlugin : public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/touch_widgets/touchbuttframe.h b/qad/touch_widgets/touchbuttframe.h index e8057c1..1d695d8 100644 --- a/qad/touch_widgets/touchbuttframe.h +++ b/qad/touch_widgets/touchbuttframe.h @@ -1,7 +1,7 @@ #ifndef TOUCHBUTTFRAME_H #define TOUCHBUTTFRAME_H -#include +#include #include #include #include "touchbutton.h" diff --git a/qad/utils/CMakeLists.txt b/qad/utils/CMakeLists.txt index c799395..575dec2 100644 --- a/qad/utils/CMakeLists.txt +++ b/qad/utils/CMakeLists.txt @@ -1,2 +1 @@ -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -qad_project(utils "${LIBS}") +qad_project(utils "Gui" "") diff --git a/qad/utils/plugin/CMakeLists.txt b/qad/utils/plugin/CMakeLists.txt index 058341f..283b630 100644 --- a/qad/utils/plugin/CMakeLists.txt +++ b/qad/utils/plugin/CMakeLists.txt @@ -1 +1 @@ -qad_plugin(utils "") +qad_plugin(utils "Gui" "") diff --git a/qad/utils/plugin/qad_utils.cpp b/qad/utils/plugin/qad_utils.cpp index 1f0505a..0b70ed0 100644 --- a/qad/utils/plugin/qad_utils.cpp +++ b/qad/utils/plugin/qad_utils.cpp @@ -10,4 +10,7 @@ QList QADUtils::customWidgets() const { return m_widgets; } + +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN2(qad_utils_plugin, QADUtils) +#endif diff --git a/qad/utils/plugin/qad_utils.h b/qad/utils/plugin/qad_utils.h index 046be18..4c825f5 100644 --- a/qad/utils/plugin/qad_utils.h +++ b/qad/utils/plugin/qad_utils.h @@ -7,8 +7,11 @@ class QADUtils: public QObject, public QDesignerCustomWidgetCollectionInterface { Q_OBJECT + //Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface") +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "qad.utils") +#endif Q_INTERFACES(QDesignerCustomWidgetCollectionInterface) - public: explicit QADUtils(QObject * parent = 0); virtual QList customWidgets() const; diff --git a/qad/widgets/CMakeLists.txt b/qad/widgets/CMakeLists.txt index 2f09131..6d5872d 100644 --- a/qad/widgets/CMakeLists.txt +++ b/qad/widgets/CMakeLists.txt @@ -1,2 +1 @@ -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_utils) -qad_project(widgets "${LIBS}") +qad_project(widgets "Gui;Widgets" "qad_utils") diff --git a/qad/widgets/plugin/CMakeLists.txt b/qad/widgets/plugin/CMakeLists.txt index b4d9aec..74db060 100644 --- a/qad/widgets/plugin/CMakeLists.txt +++ b/qad/widgets/plugin/CMakeLists.txt @@ -1 +1 @@ -qad_plugin(widgets "") +qad_plugin(widgets "Gui;Widgets" "") diff --git a/qad/widgets/plugin/chardialogplugin.h b/qad/widgets/plugin/chardialogplugin.h index 8f447ea..5ea0042 100644 --- a/qad/widgets/plugin/chardialogplugin.h +++ b/qad/widgets/plugin/chardialogplugin.h @@ -1,7 +1,11 @@ #ifndef CHARDIALOGPLUGIN_H #define CHARDIALOGPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class CharDialogPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/clineeditplugin.h b/qad/widgets/plugin/clineeditplugin.h index 2c1ff17..e10dfb2 100644 --- a/qad/widgets/plugin/clineeditplugin.h +++ b/qad/widgets/plugin/clineeditplugin.h @@ -1,7 +1,11 @@ #ifndef CLINEEDITPLUGIN_H #define CLINEEDITPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class CLineEditPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/colorbuttonplugin.h b/qad/widgets/plugin/colorbuttonplugin.h index a19619d..97f3529 100644 --- a/qad/widgets/plugin/colorbuttonplugin.h +++ b/qad/widgets/plugin/colorbuttonplugin.h @@ -1,7 +1,11 @@ #ifndef COLORBUTTONPLUGIN_H #define COLORBUTTONPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class ColorButtonPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/ecomboboxplugin.h b/qad/widgets/plugin/ecomboboxplugin.h index 9038c97..6cb7ce5 100644 --- a/qad/widgets/plugin/ecomboboxplugin.h +++ b/qad/widgets/plugin/ecomboboxplugin.h @@ -1,7 +1,11 @@ #ifndef ECOMBOBOXPLUGIN_H #define ECOMBOBOXPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class EComboBoxPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/iconedlabelplugin.h b/qad/widgets/plugin/iconedlabelplugin.h index d2be41e..5ee4306 100644 --- a/qad/widgets/plugin/iconedlabelplugin.h +++ b/qad/widgets/plugin/iconedlabelplugin.h @@ -1,7 +1,11 @@ #ifndef ICONEDLABEPLUGIN_H #define ICONEDLABEPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class IconedLabelPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/qad_widgets.cpp b/qad/widgets/plugin/qad_widgets.cpp index 57fe666..3e7c7be 100644 --- a/qad/widgets/plugin/qad_widgets.cpp +++ b/qad/widgets/plugin/qad_widgets.cpp @@ -1,3 +1,4 @@ +#include "qad_widgets.h" #include "spinsliderplugin.h" #include "colorbuttonplugin.h" #include "chardialogplugin.h" @@ -12,7 +13,6 @@ #include "qcodeeditplugin.h" #include "qvarianteditplugin.h" #include "qpiconfigplugin.h" -#include "qad_widgets.h" QADWidgets::QADWidgets(QObject * parent): QObject(parent) { @@ -37,4 +37,7 @@ QList QADWidgets::customWidgets() const { return m_widgets; } + +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN2(qad_widgets_plugin, QADWidgets) +#endif diff --git a/qad/widgets/plugin/qad_widgets.h b/qad/widgets/plugin/qad_widgets.h index bac6dca..e18e8f9 100644 --- a/qad/widgets/plugin/qad_widgets.h +++ b/qad/widgets/plugin/qad_widgets.h @@ -8,7 +8,9 @@ class QADWidgets: public QObject, public QDesignerCustomWidgetCollectionInterfac { Q_OBJECT Q_INTERFACES(QDesignerCustomWidgetCollectionInterface) - +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "qad.widgets") +#endif public: explicit QADWidgets(QObject * parent = 0); virtual QList customWidgets() const; diff --git a/qad/widgets/plugin/qcodeeditplugin.h b/qad/widgets/plugin/qcodeeditplugin.h index f14d448..66bf0ed 100644 --- a/qad/widgets/plugin/qcodeeditplugin.h +++ b/qad/widgets/plugin/qcodeeditplugin.h @@ -1,7 +1,11 @@ #ifndef QCODEEDITPLUGIN_H #define QCODEEDITPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class QCodeEditPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/qipeditplugin.h b/qad/widgets/plugin/qipeditplugin.h index afe910f..a860fd8 100644 --- a/qad/widgets/plugin/qipeditplugin.h +++ b/qad/widgets/plugin/qipeditplugin.h @@ -1,7 +1,11 @@ #ifndef QIPEDITPLUGIN_H #define QIPEDITPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class QIPEditPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/qpiconfigplugin.h b/qad/widgets/plugin/qpiconfigplugin.h index 7844196..bd40d67 100644 --- a/qad/widgets/plugin/qpiconfigplugin.h +++ b/qad/widgets/plugin/qpiconfigplugin.h @@ -1,7 +1,11 @@ #ifndef QPICONFIGPLUGIN_H #define QPICONFIGPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class QPIConfigPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/qpiconsoleplugin.h b/qad/widgets/plugin/qpiconsoleplugin.h index 2f2b38f..1c79b70 100644 --- a/qad/widgets/plugin/qpiconsoleplugin.h +++ b/qad/widgets/plugin/qpiconsoleplugin.h @@ -1,7 +1,11 @@ #ifndef QPICONSOLEPLUGIN_H #define QPICONSOLEPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class QPIConsolePlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/qpointeditplugin.h b/qad/widgets/plugin/qpointeditplugin.h index 9ab5177..b33a143 100644 --- a/qad/widgets/plugin/qpointeditplugin.h +++ b/qad/widgets/plugin/qpointeditplugin.h @@ -1,7 +1,11 @@ #ifndef QPOINTEDITPLUGIN_H #define QPOINTEDITPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class QPointEditPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/qrecteditplugin.h b/qad/widgets/plugin/qrecteditplugin.h index 54beeaf..d88aefb 100644 --- a/qad/widgets/plugin/qrecteditplugin.h +++ b/qad/widgets/plugin/qrecteditplugin.h @@ -1,7 +1,11 @@ #ifndef QRECTEDITPLUGIN_H #define QRECTEDITPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class QRectEditPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/qvarianteditplugin.h b/qad/widgets/plugin/qvarianteditplugin.h index 20b0b3d..5847d9b 100644 --- a/qad/widgets/plugin/qvarianteditplugin.h +++ b/qad/widgets/plugin/qvarianteditplugin.h @@ -1,7 +1,11 @@ #ifndef QVARIANTEDITPLUGIN_H #define QVARIANTEDITPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class QVariantEditPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/shortcutsplugin.h b/qad/widgets/plugin/shortcutsplugin.h index d2eca1b..17f23c1 100644 --- a/qad/widgets/plugin/shortcutsplugin.h +++ b/qad/widgets/plugin/shortcutsplugin.h @@ -1,7 +1,11 @@ #ifndef SHORTCUTSPLUGIN_H #define SHORTCUTSPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class ShortcutsPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qad/widgets/plugin/spinsliderplugin.h b/qad/widgets/plugin/spinsliderplugin.h index fbf4d85..af77ecc 100644 --- a/qad/widgets/plugin/spinsliderplugin.h +++ b/qad/widgets/plugin/spinsliderplugin.h @@ -1,7 +1,11 @@ #ifndef SPINSLIDERPLUGIN_H #define SPINSLIDERPLUGIN_H -#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif class SpinSliderPlugin: public QObject, public QDesignerCustomWidgetInterface { diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt index e7fd99a..2a85813 100644 --- a/qcd_utils/CMakeLists.txt +++ b/qcd_utils/CMakeLists.txt @@ -1,6 +1,6 @@ project(qcd_utils) cmake_minimum_required(VERSION 2.6) -cmake_policy(SET CMP0017 OLD) +#cmake_policy(SET CMP0017 OLD) if (NOT LIBPROJECT) find_package(PIP REQUIRED) option(LIB "System install" 0) @@ -11,35 +11,37 @@ if (NOT LIBPROJECT) endif() endif() find_package(QAD REQUIRED) +list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME}) +set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE) include_directories(${PIP_INCLUDES} ${QAD_INCLUDES}) -qt_project(${PROJECT_NAME} H CPP) -add_library(${PROJECT_NAME} SHARED ${H} ${CPP}) -set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} cd_utils piqt) -target_link_libraries(${PROJECT_NAME} ${LIBS}) +file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") +find_qt(${QtVersions} Core Gui) +qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) +qt_add_library(${PROJECT_NAME} SHARED out_CPP) +qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets cd_utils piqt) message(STATUS "Building ${PROJECT_NAME}") -if (LIBPROJECT) - sdk_install("" ${PROJECT_NAME} "${H}") +if(LIBPROJECT) + sdk_install("" "${PROJECT_NAME}" "${out_HDR}") else() if(LIB) if(WIN32) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) - install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/pip) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) - get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) - install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) + install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) else() if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() set(CMAKE_INSTALL_PREFIX /usr) endif() - install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) - install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() endif() diff --git a/qcd_utils/pult/CMakeLists.txt b/qcd_utils/pult/CMakeLists.txt index 66e98d3..81bae3f 100644 --- a/qcd_utils/pult/CMakeLists.txt +++ b/qcd_utils/pult/CMakeLists.txt @@ -1,21 +1,22 @@ -qt_project(cd_pult PULT_H PULT_CPP) -add_executable(${PROJECT_NAME} WIN32 ${PULT_H} ${PULT_CPP}) -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_GRAPHIC_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} qcd_utils) -target_link_libraries(${PROJECT_NAME} ${LIBS}) +project(cd_pult) +file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") +find_qt(${QtVersions} Core Gui) +qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) +qt_add_executable(${PROJECT_NAME} WIN32 out_CPP) +qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_graphic qcd_utils) message(STATUS "Building ${PROJECT_NAME}") if(LIB) if(WIN32) - install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) else() if(APPLE) - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) endif() endif() - message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") + #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") else() - install(TARGETS ${PROJECT_NAME} DESTINATION bin) - message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") + qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) + #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() - diff --git a/qcd_utils/pult/main.cpp b/qcd_utils/pult/main.cpp index 3b1241c..f5233e0 100644 --- a/qcd_utils/pult/main.cpp +++ b/qcd_utils/pult/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "form.h"