diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-26 10:10:55 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-12-04 10:48:06 +0000 |
commit | 0f220d473a6048c0f1267a96ed5cc18fa39ee61c (patch) | |
tree | 20b4c0bbaa908e86973466e5b2b8ae8e52dbbca7 /src/gui | |
parent | 9eea24ed601d0aa243269fac64c9a65c3750d1b0 (diff) |
Collect Json Metatypes from CMake's Automoc
This patch adds a new bootstrap tool which will read CMake's
AutoGenInfo.json and ParseCache.txt to determine what the current
list of json files is that needs to be passed to moc --collect-json
option.
Right now this is enabled for qt_add_module() with the option
GENERATE_METATYPES. pro2cmake has also been updated to detect qmake's
CONFIG += metatypes and to generate the above option for modules.
The implementation lives in Qt6CoreMacros so it can eventually be used
in the public facing apis.
The generated meta types file is saved under the target property
QT_MODULE_META_TYPES_FILE.
Change-Id: I03709c662be81dd0912d0068c23ee2507bfe4383
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/.prev_CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/gui/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 68cf6aab0c..90b66fd882 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_module(Gui + GENERATE_METATYPES PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations SOURCES image/qbitmap.cpp image/qbitmap.h diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 9f146721c0..e14cbc4144 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -46,6 +46,7 @@ endif() # special case end qt_add_module(Gui + GENERATE_METATYPES PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations FEATURE_DEPENDENCIES # special case: Qt::Network # special case: |