diff options
| -rw-r--r-- | 3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp | 2 | ||||
| -rw-r--r-- | 3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp | 2 | ||||
| -rw-r--r-- | 3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp | 2 | ||||
| -rw-r--r-- | 3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp | 2 | ||||
| -rw-r--r-- | 3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp | 2 | ||||
| -rw-r--r-- | 3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp | 2 | ||||
| -rw-r--r-- | 3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gui/gui.cmake | 37 |
9 files changed, 42 insertions, 11 deletions
diff --git a/3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp index 58cfc510..f194c76a 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.cpp" +#include "moc_qtbuttonpropertybrowser.hpp" diff --git a/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp b/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp index a2ef86c9..e7f7241e 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.cpp" +#include "moc_qteditorfactory.hpp" #include "qteditorfactory.moc" diff --git a/3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp index caf074db..6e4d2490 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.cpp" +#include "moc_qtgroupboxpropertybrowser.hpp" diff --git a/3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp index 2449fcb8..6ec09ac1 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.cpp" +#include "moc_qtpropertybrowser.hpp" diff --git a/3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp b/3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp index ef627e9c..6dea25a3 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.cpp" +#include "moc_qtpropertymanager.hpp" #include "qtpropertymanager.moc" diff --git a/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp b/3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp index 9e506af3..4e6f16a9 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.cpp" +#include "moc_qttreepropertybrowser.hpp" #include "qttreepropertybrowser.moc" diff --git a/3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp b/3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp index c41730c8..6145b2ab 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.cpp" +#include "moc_qtvariantproperty.hpp" diff --git a/CMakeLists.txt b/CMakeLists.txt index e6c6803d..83486603 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,7 @@ foreach (family ${FAMILIES}) foreach (target ${family_targets}) # Include family-specific source files to all family targets and set defines appropriately target_include_directories(${target} PRIVATE ${family}/) - target_compile_definitions(${target} PRIVATE ARCH_${ufamily} ARCHNAME=${family}) + target_compile_definitions(${target} PRIVATE ARCH_${ufamily} ARCHNAME=${family} -DQT_NO_KEYWORDS) target_link_libraries(${target} LINK_PUBLIC ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${GUI_LIBRARY_FILES}) endforeach (target) endforeach (family) diff --git a/gui/gui.cmake b/gui/gui.cmake index 6c11a6d1..95a4a397 100644 --- a/gui/gui.cmake +++ b/gui/gui.cmake @@ -2,8 +2,6 @@ find_package(Qt5 COMPONENTS Core Widgets OpenGL REQUIRED) find_package(OpenGL REQUIRED) -ADD_DEFINITIONS(-DQT_NO_KEYWORDS) - include( gui/Qt5Customizations.cmake ) # Find includes in corresponding build directories @@ -24,4 +22,37 @@ qt5_wrap_ui_custom(GENERATED_UI_HEADERS ${UI_SOURCES}) qt5_add_resources_custom(GUI_RESOURCE_FILES gui/nextpnr.qrc) set(GUI_SOURCE_FILES gui/mainwindow.cc gui/fpgaviewwidget.cc gui/emb.cc ${GENERATED_MOC_FILES} ${GENERATED_UI_HEADERS} ${GUI_RESOURCE_FILES}) -set(GUI_LIBRARY_FILES Qt5::Widgets Qt5::OpenGL ${OPENGL_LIBRARIES})
\ No newline at end of file +set(GUI_LIBRARY_FILES Qt5::Widgets Qt5::OpenGL ${OPENGL_LIBRARIES}) + + +add_library(QtPropertyBrowser STATIC "") +qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtpropertybrowser.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtpropertybrowser.hpp) +qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtgroupboxpropertybrowser.hpp) +qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtvariantproperty.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtvariantproperty.hpp) +qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtpropertymanager.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtpropertymanager.hpp) +qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtbuttonpropertybrowser.hpp) +qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qteditorfactory.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qteditorfactory.hpp) +qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qttreepropertybrowser.hpp) + +qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated/qtpropertymanager.moc) +qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated/qttreepropertybrowser.moc) +qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated/qteditorfactory.moc) + +set(QTPB_GENERATED_MOC_FILES + ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtpropertybrowser.hpp + ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtgroupboxpropertybrowser.hpp + ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtvariantproperty.hpp + ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtpropertymanager.hpp + ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtbuttonpropertybrowser.hpp + ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qteditorfactory.hpp + ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qttreepropertybrowser.hpp + ${CMAKE_CURRENT_BINARY_DIR}/generated/qtpropertymanager.moc + ${CMAKE_CURRENT_BINARY_DIR}/generated/qttreepropertybrowser.moc + ${CMAKE_CURRENT_BINARY_DIR}/generated/qteditorfactory.moc +) + +aux_source_directory(3rdparty/QtPropertyBrowser/src/ QTPROPBROWSER_SRC_ALL) +target_sources(QtPropertyBrowser PRIVATE ${QTPROPBROWSER_SRC_ALL} ${QTPB_GENERATED_MOC_FILES} ) +target_include_directories(QtPropertyBrowser PRIVATE 3rdparty/QtPropertyBrowser/src generated) +target_link_libraries(QtPropertyBrowser PRIVATE Qt5::Widgets) + |