From e14b8bac66bf9a65ddd709fba53aac017691f0c8 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 20 Jun 2018 14:24:16 +0200 Subject: put source changes for qtpropertybrowser back and make build simple --- 3rdparty/QtPropertyBrowser/.gitignore | 6 ++++ 3rdparty/QtPropertyBrowser/CMakeLists.txt | 41 ---------------------- 3rdparty/QtPropertyBrowser/src/CMakeLists.txt | 28 +-------------- .../src/qtbuttonpropertybrowser.cpp | 2 +- 3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp | 2 +- .../src/qtgroupboxpropertybrowser.cpp | 2 +- .../QtPropertyBrowser/src/qtpropertybrowser.cpp | 2 +- .../QtPropertyBrowser/src/qtpropertymanager.cpp | 2 +- .../src/qttreepropertybrowser.cpp | 2 +- .../QtPropertyBrowser/src/qtvariantproperty.cpp | 2 +- 10 files changed, 14 insertions(+), 75 deletions(-) (limited to '3rdparty') diff --git a/3rdparty/QtPropertyBrowser/.gitignore b/3rdparty/QtPropertyBrowser/.gitignore index b667c89b..8472a980 100644 --- a/3rdparty/QtPropertyBrowser/.gitignore +++ b/3rdparty/QtPropertyBrowser/.gitignore @@ -29,3 +29,9 @@ # Ignores 'build' in any sub folder build/ + +src/moc_*.cpp +src/*.moc +src/qrc_*.cpp +src/*_automoc.cpp +src/*_export.h \ No newline at end of file diff --git a/3rdparty/QtPropertyBrowser/CMakeLists.txt b/3rdparty/QtPropertyBrowser/CMakeLists.txt index 1495c343..952581bc 100644 --- a/3rdparty/QtPropertyBrowser/CMakeLists.txt +++ b/3rdparty/QtPropertyBrowser/CMakeLists.txt @@ -1,17 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) PROJECT(QtPropertyBrowser) -########################### Misc. Configs ############################## -# Add custom cmake files folder -SET (PROJECT_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake) -SET (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_CMAKE_DIR}") - -# Add custom Compile Settings and flags -INCLUDE(CompileSettings) - -# Add custom Install Settings -INCLUDE(InstallSettings) - ##################### Look for required libraries ###################### # Add QT dependencies @@ -19,33 +8,3 @@ FIND_PACKAGE(Qt5Widgets REQUIRED) ######################### Add Primary Targets ########################## ADD_SUBDIRECTORY(src) - -########################## Add the Examples ############################ -OPTION (BUILD_EXAMPLES "Build Examples" ON) -IF(BUILD_EXAMPLES) - ADD_SUBDIRECTORY(examples) -ENDIF() - -######################### Installation Stuff ########################### -INCLUDE(InstallProjectConfig) - -###################### Add uninstall target ############################ -ADD_CUSTOM_TARGET(uninstall - COMMAND ${CMAKE_COMMAND} -P ${PROJECT_CMAKE_DIR}/cmake_uninstall.cmake) - -##################### Show Configuration Summary ###################### -MESSAGE(STATUS "===============================================================") -MESSAGE(STATUS "================ Configuration Summary ======================") -MESSAGE(STATUS "Project Name: ${PROJECT_NAME}") -MESSAGE(STATUS "Build type: ${CMAKE_BUILD_TYPE}") -MESSAGE(STATUS "Build type Flags: ${CMAKE_BUILD_TYPE_FLAGS}") -MESSAGE(STATUS "C++ compile flags: ${CMAKE_CXX_FLAGS}") -MESSAGE(STATUS "Install Path: ${CMAKE_INSTALL_PREFIX}") -MESSAGE(STATUS "Build Examples: ${BUILD_EXAMPLES}") -IF(Qt5Widgets_FOUND) - MESSAGE(STATUS "QT Version: ${Qt5Widgets_VERSION_STRING}") - MESSAGE(STATUS "QT INCLUDE DIRS: ${Qt5Widgets_INCLUDE_DIRS}") - MESSAGE(STATUS "QT COMPILE DEFS: ${Qt5Widgets_COMPILE_DEFINITIONS}") - MESSAGE(STATUS "QT DEFS: ${Qt5Widgets_DEFINITIONS}") - MESSAGE(STATUS "QT EXE FLAGS: ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") -ENDIF() diff --git a/3rdparty/QtPropertyBrowser/src/CMakeLists.txt b/3rdparty/QtPropertyBrowser/src/CMakeLists.txt index ac70956d..abee16a1 100644 --- a/3rdparty/QtPropertyBrowser/src/CMakeLists.txt +++ b/3rdparty/QtPropertyBrowser/src/CMakeLists.txt @@ -16,9 +16,6 @@ set(_SRCS qtvariantproperty.cpp ) -file(GLOB _IMPL_HDRS *.h) -file(GLOB _PUBLIC_HDRS Qt*) - set(_UI_FORMS ) @@ -31,7 +28,7 @@ QT5_ADD_RESOURCES(_QRC_SRCS ${_RESOURCES}) set(TARGET_NAME ${PROJECT_NAME}) -add_library(${TARGET_NAME} +add_library(${TARGET_NAME} STATIC ${_SRCS} ${_UI_SRCS} ${_QRC_SRCS} @@ -39,26 +36,3 @@ add_library(${TARGET_NAME} ) target_link_libraries(${TARGET_NAME} Qt5::Widgets) - -######################### Installation Stuff ########################### -include(GenerateExportHeader) -generate_export_header(${TARGET_NAME}) - -install(TARGETS ${TARGET_NAME} - EXPORT ${TARGET_NAME}Targets - RUNTIME DESTINATION ${INSTALL_BIN_DIR} - LIBRARY DESTINATION ${INSTALL_LIB_DIR} - ARCHIVE DESTINATION ${INSTALL_LIB_DIR} - INCLUDES DESTINATION ${INSTALL_INCLUDE_DIR} -) - -install( - FILES - ${_PUBLIC_HDRS} - ${_IMPL_HDRS} - DESTINATION - ${INSTALL_INCLUDE_DIR} - COMPONENT - Devel -) - diff --git a/3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp index f194c76a..58cfc510 100644 --- a/3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp +++ b/3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp @@ -626,4 +626,4 @@ bool QtButtonPropertyBrowser::isExpanded(QtBrowserItem *item) const QT_END_NAMESPACE #endif -#include "moc_qtbuttonpropertybrowser.hpp" +#include "moc_qtbuttonpropertybrowser.cpp" diff --git a/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp b/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp index e7f7241e..a2ef86c9 100644 --- a/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp +++ b/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp @@ -2575,5 +2575,5 @@ void QtFontEditorFactory::disconnectPropertyManager(QtFontPropertyManager *manag QT_END_NAMESPACE #endif -#include "moc_qteditorfactory.hpp" +#include "moc_qteditorfactory.cpp" #include "qteditorfactory.moc" diff --git a/3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp index 6e4d2490..caf074db 100644 --- a/3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp +++ b/3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp @@ -533,4 +533,4 @@ void QtGroupBoxPropertyBrowser::itemChanged(QtBrowserItem *item) QT_END_NAMESPACE #endif -#include "moc_qtgroupboxpropertybrowser.hpp" +#include "moc_qtgroupboxpropertybrowser.cpp" diff --git a/3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp index 6ec09ac1..2449fcb8 100644 --- a/3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp +++ b/3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp @@ -2045,4 +2045,4 @@ void QtAbstractPropertyBrowser::setCurrentItem(QtBrowserItem *item) QT_END_NAMESPACE #endif -#include "moc_qtpropertybrowser.hpp" +#include "moc_qtpropertybrowser.cpp" diff --git a/3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp b/3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp index 6dea25a3..ef627e9c 100644 --- a/3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp +++ b/3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp @@ -6421,5 +6421,5 @@ void QtCursorPropertyManager::uninitializeProperty(QtProperty *property) QT_END_NAMESPACE #endif -#include "moc_qtpropertymanager.hpp" +#include "moc_qtpropertymanager.cpp" #include "qtpropertymanager.moc" diff --git a/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp index 4e6f16a9..9e506af3 100644 --- a/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp +++ b/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp @@ -1072,5 +1072,5 @@ void QtTreePropertyBrowser::editItem(QtBrowserItem *item) QT_END_NAMESPACE #endif -#include "moc_qttreepropertybrowser.hpp" +#include "moc_qttreepropertybrowser.cpp" #include "qttreepropertybrowser.moc" diff --git a/3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp b/3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp index 6145b2ab..c41730c8 100644 --- a/3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp +++ b/3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp @@ -2355,4 +2355,4 @@ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager QT_END_NAMESPACE #endif -#include "moc_qtvariantproperty.hpp" +#include "moc_qtvariantproperty.cpp" -- cgit v1.2.3