diff options
| -rw-r--r-- | mkspecs/features/metatypes.prf | 2 | ||||
| -rw-r--r-- | src/corelib/corelib.pro | 3 | ||||
| -rw-r--r-- | src/gui/gui.pro | 4 | ||||
| -rw-r--r-- | src/widgets/widgets.pro | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/mkspecs/features/metatypes.prf b/mkspecs/features/metatypes.prf index c6a655c7f1..c2eb8d8659 100644 --- a/mkspecs/features/metatypes.prf +++ b/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 diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index eca888385b..3430154d13 100644 --- a/src/corelib/corelib.pro +++ b/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 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 diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 2aa56ded93..2d5ba05d40 100644 --- a/src/widgets/widgets.pro +++ b/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 |