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>

mkspecs/features/metatypes.prf

@@ -28,7 +28,7 @@ moc_json_source.variable_out = MOC_JSON_FILES
 
 MOC_COLLECT_JSON_OUTPUT = $$lower($$basename(TARGET))_metatypes.json
 
-moc_collect_json.CONFIG += no_link combine
+moc_collect_json.CONFIG += no_link combine target_predeps
 moc_collect_json.commands = $$MOC_COLLECT_JSON --collect-json -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
 moc_collect_json.input = MOC_JSON_FILES
 moc_collect_json.output = $$MOC_COLLECT_JSON_OUTPUT

src/corelib/corelib.pro

@@ -1,6 +1,6 @@
 TARGET	   = QtCore
 QT         =
-CONFIG    += exceptions metatypes install_metatypes
+CONFIG    += exceptions
 
 MODULE = core     # not corelib, as per project file
 MODULE_CONFIG = moc resources
@@ -17,6 +17,7 @@ DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH
 msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x67000000
 
 CONFIG += simd optimize_full
+CONFIG += metatypes install_metatypes
 
 QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf
 

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

src/widgets/widgets.pro

@@ -9,8 +9,6 @@ msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x65000000
 TRACEPOINT_PROVIDER = $$PWD/qtwidgets.tracepoints
 CONFIG += qt_tracepoints
 
-CONFIG += metatypes install_metatypes
-
 QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf
 
 #platforms
@@ -47,3 +45,5 @@ testcocoon {
 MODULE_PLUGIN_TYPES += \
     styles
 load(qt_module)
+
+CONFIG += metatypes install_metatypes