Qt5 build fixes

--HG--
branch : qt5
hg/feature/qt5
kaetemi 10 years ago
parent 0cd6da40bf
commit 885a7570f2

@ -20,7 +20,7 @@ SET(QT_PROPERTY_EDITOR_RCS qtpropertybrowser.qrc)
SET(QT_USE_QTGUI TRUE) SET(QT_USE_QTGUI TRUE)
IF(WITH_QT5) IF(WITH_QT5)
SET(CMAKE_AUTOMOC ON) SET(CMAKE_AUTOMOC OFF)
QT5_ADD_RESOURCES(QT_PROPERTY_EDITOR_RC_SRCS ${QT_PROPERTY_EDITOR_RCS}) QT5_ADD_RESOURCES(QT_PROPERTY_EDITOR_RC_SRCS ${QT_PROPERTY_EDITOR_RCS})
QT5_WRAP_CPP(QT_PROPERTY_EDITOR_MOC_SRC ${QT_PROPERTY_EDITOR_HDR}) QT5_WRAP_CPP(QT_PROPERTY_EDITOR_MOC_SRC ${QT_PROPERTY_EDITOR_HDR})
ELSE(WITH_QT5) ELSE(WITH_QT5)
@ -33,9 +33,6 @@ SOURCE_GROUP(QtGeneratedMocSrc FILES ${QT_PROPERTY_EDITOR_MOC_SRC})
SOURCE_GROUP("Qt Property Editor Source" FILES ${SRC}) SOURCE_GROUP("Qt Property Editor Source" FILES ${SRC})
IF(WITH_QT5) IF(WITH_QT5)
qt5_generate_moc(qtpropertymanager.cpp ${CMAKE_CURRENT_BINARY_DIR}/qtpropertymanager.moc)
qt5_generate_moc(qteditorfactory.cpp ${CMAKE_CURRENT_BINARY_DIR}/qteditorfactory.moc)
qt5_generate_moc(qttreepropertybrowser.cpp ${CMAKE_CURRENT_BINARY_DIR}/qttreepropertybrowser.moc)
ELSE(WITH_QT5) ELSE(WITH_QT5)
qt4_generate_moc(qtpropertymanager.cpp ${CMAKE_CURRENT_BINARY_DIR}/qtpropertymanager.moc) qt4_generate_moc(qtpropertymanager.cpp ${CMAKE_CURRENT_BINARY_DIR}/qtpropertymanager.moc)
qt4_generate_moc(qteditorfactory.cpp ${CMAKE_CURRENT_BINARY_DIR}/qteditorfactory.moc) qt4_generate_moc(qteditorfactory.cpp ${CMAKE_CURRENT_BINARY_DIR}/qteditorfactory.moc)

@ -529,4 +529,4 @@ void QtGroupBoxPropertyBrowser::itemChanged(QtBrowserItem *item)
QT_END_NAMESPACE QT_END_NAMESPACE
#endif #endif
#include "moc_qtgroupboxpropertybrowser.cpp" //#include "moc_qtgroupboxpropertybrowser.cpp"

@ -2021,4 +2021,4 @@ void QtAbstractPropertyBrowser::setCurrentItem(QtBrowserItem *item)
QT_END_NAMESPACE QT_END_NAMESPACE
#endif #endif
#include "moc_qtpropertybrowser.cpp" //#include "moc_qtpropertybrowser.cpp"

@ -2185,4 +2185,4 @@ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qtvariantproperty.cpp" //#include "moc_qtvariantproperty.cpp"

Loading…
Cancel
Save