From 885a7570f26eeef137d40bf2f7b855cac3d2c21b Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Thu, 18 Sep 2014 20:32:15 +0200
Subject: [PATCH] Qt5 build fixes

--HG--
branch : qt5
---
 code/studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt    | 5 +----
 .../3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp | 2 +-
 .../src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp     | 2 +-
 .../src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp     | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/code/studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt b/code/studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt
index 33362a4cc..49e8aafe1 100644
--- a/code/studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt
+++ b/code/studio/src/3rdparty/qtpropertybrowser/CMakeLists.txt
@@ -20,7 +20,7 @@ SET(QT_PROPERTY_EDITOR_RCS	qtpropertybrowser.qrc)
 SET(QT_USE_QTGUI TRUE)
 
 IF(WITH_QT5)
-	SET(CMAKE_AUTOMOC ON)
+	SET(CMAKE_AUTOMOC OFF)
 	QT5_ADD_RESOURCES(QT_PROPERTY_EDITOR_RC_SRCS ${QT_PROPERTY_EDITOR_RCS})
 	QT5_WRAP_CPP(QT_PROPERTY_EDITOR_MOC_SRC ${QT_PROPERTY_EDITOR_HDR})
 ELSE(WITH_QT5)
@@ -33,9 +33,6 @@ SOURCE_GROUP(QtGeneratedMocSrc FILES ${QT_PROPERTY_EDITOR_MOC_SRC})
 SOURCE_GROUP("Qt Property Editor Source" FILES ${SRC})
 
 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)
 	qt4_generate_moc(qtpropertymanager.cpp ${CMAKE_CURRENT_BINARY_DIR}/qtpropertymanager.moc)
 	qt4_generate_moc(qteditorfactory.cpp ${CMAKE_CURRENT_BINARY_DIR}/qteditorfactory.moc)
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
index 600d5799c..fb67ddc78 100644
--- a/code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
+++ b/code/studio/src/3rdparty/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
@@ -529,4 +529,4 @@ void QtGroupBoxPropertyBrowser::itemChanged(QtBrowserItem *item)
 QT_END_NAMESPACE
 #endif
 
-#include "moc_qtgroupboxpropertybrowser.cpp"
+//#include "moc_qtgroupboxpropertybrowser.cpp"
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp
index 4f0a2127b..45da766f1 100644
--- a/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp
+++ b/code/studio/src/3rdparty/qtpropertybrowser/qtpropertybrowser.cpp
@@ -2021,4 +2021,4 @@ void QtAbstractPropertyBrowser::setCurrentItem(QtBrowserItem *item)
 QT_END_NAMESPACE
 #endif
 
-#include "moc_qtpropertybrowser.cpp"
+//#include "moc_qtpropertybrowser.cpp"
diff --git a/code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp b/code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp
index 66c59d2d2..0106419df 100644
--- a/code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp
+++ b/code/studio/src/3rdparty/qtpropertybrowser/qtvariantproperty.cpp
@@ -2185,4 +2185,4 @@ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager
 
 QT_END_NAMESPACE
 
-#include "moc_qtvariantproperty.cpp"
+//#include "moc_qtvariantproperty.cpp"