diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-11 13:02:32 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-13 15:26:03 +0000 |
| commit | 1e5d1a43dc14240b24615d4cc9a291d5237ea8bf (patch) | |
| tree | e03c133c3a2f03a03ffe676724f7ace5704081a2 /src/corelib | |
| parent | 63dae62b7fc6105a45dc88e01d205c89bcf0b683 (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/corelib')
| -rw-r--r-- | src/corelib/corelib.pro | 3 |
1 files changed, 2 insertions, 1 deletions
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 |