summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-12-12 10:55:20 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2018-12-14 14:04:59 +0000
commite57a94cbd8f28ccab8b3368afc4365237c533a4f (patch)
treeabfa6a25629580f6a76a0cf2d06cdeb593339b2b /src/gui
parent07dfa3013c94ddfda692ac235b2e022f8265c450 (diff)
CMake: Use AUTOMOC/AUTOUIC/AUTORCC
Change-Id: I0235ca4f227623e5937348b4b010637921dbf154 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/CMakeLists.txt8
-rw-r--r--src/gui/util/qshaderlanguage_p.h3
2 files changed, 10 insertions, 1 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 69f5d31af7..dd2b101689 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -235,6 +235,14 @@ add_qt_module(Gui
Qt::Core
)
+set_source_files_properties(
+ # Comment triggering moc:
+ opengl/qopenglfunctions.cpp
+ PROPERTIES
+ SKIP_AUTOMOC ON
+ SKIP_AUTOUIC ON
+ SKIP_AUTORCC ON)
+
## Scopes:
#####################################################################
diff --git a/src/gui/util/qshaderlanguage_p.h b/src/gui/util/qshaderlanguage_p.h
index e392a6c7bb..e31dcd3a9b 100644
--- a/src/gui/util/qshaderlanguage_p.h
+++ b/src/gui/util/qshaderlanguage_p.h
@@ -59,7 +59,8 @@ QT_BEGIN_NAMESPACE
namespace QShaderLanguage
{
- Q_GUI_EXPORT Q_NAMESPACE
+ Q_GUI_EXPORT
+ Q_NAMESPACE
enum StorageQualifier : char {
Const = 1,