summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-11-11 13:02:32 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2019-11-13 15:26:03 +0000
commit1e5d1a43dc14240b24615d4cc9a291d5237ea8bf (patch)
treee03c133c3a2f03a03ffe676724f7ace5704081a2 /src/gui
parent63dae62b7fc6105a45dc88e01d205c89bcf0b683 (diff)
Make sure the metatypes are installed in prefix builds
The JSON collection step has to be target_predeps in order to be executed if the only place its output is referred to is INSTALLS. Furthermore, some CONFIG options clear the INSTALLS variable. Therefore, we need to add the metatypes CONFIG entries after those. Change-Id: I4694ab1d82c13cb4e3886c1722a03255d14b7f29 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/gui.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index decfb364cf..350d4c5ee3 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -35,7 +35,7 @@ testcocoon {
osx: LIBS_PRIVATE += -framework AppKit
darwin: LIBS_PRIVATE += -framework CoreGraphics
-CONFIG += simd optimize_full metatypes install_metatypes
+CONFIG += simd optimize_full
include(accessible/accessible.pri)
include(kernel/kernel.pri)
@@ -99,4 +99,4 @@ qtConfig(egl): CMAKE_EGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_EGL)
QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist
TRACEPOINT_PROVIDER = $$PWD/qtgui.tracepoints
-CONFIG += qt_tracepoints
+CONFIG += qt_tracepoints metatypes install_metatypes