diff options
| author | Tasuku Suzuki <[email protected]> | 2020-02-28 03:26:25 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <[email protected]> | 2020-03-04 10:48:18 +0900 |
| commit | d147b99f753aab42f29cd069b5f028e3f354751e (patch) | |
| tree | 061e16731107e6d22c41fb40f4811ff19bdf3b33 | |
| parent | 48deaf9a3e323181662d3c031dbe3c729ecc2bee (diff) | |
Fix build without commandlineparser and temporaryfile
qmltyperegistrar uses QSaveFile which needs features.temporaryfile
Change-Id: Ib64eb2d357ee5e75f12f81f15bbe4969d4d96872
Reviewed-by: Ulf Hermann <[email protected]>
| -rw-r--r-- | qtdeclarative.pro | 5 | ||||
| -rw-r--r-- | src/src.pro | 3 | ||||
| -rw-r--r-- | tools/tools.pro | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/qtdeclarative.pro b/qtdeclarative.pro index 5b94da9b69..84120bfd07 100644 --- a/qtdeclarative.pro +++ b/qtdeclarative.pro @@ -1,4 +1,9 @@ CONFIG += tests_need_tools examples_need_tools + +# Otherwise we cannot compile src/qmltyperegistrar +requires(qtConfig(commandlineparser)) +requires(qtConfig(temporaryfile)) + load(qt_parts) !python_available { diff --git a/src/src.pro b/src/src.pro index 2855102eff..c9de88e942 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,9 +4,6 @@ include($$OUT_PWD/qml/qtqml-config.pri) include($$OUT_PWD/quick/qtquick-config.pri) QT_FOR_CONFIG += qml qml-private quick-private -# Otherwise we cannot compile qmltyperegistrar -requires(qtConfig(commandlineparser)) - # We need qmltyperegistrar for all type registrations, even in qml SUBDIRS += \ qmltyperegistrar \ diff --git a/tools/tools.pro b/tools/tools.pro index d16f78071c..07eaa0be70 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -7,11 +7,11 @@ qtConfig(qml-devtools) { qmlimportscanner \ qmlformat - qtConfig(commandlineparser):qtConfig(xmlstreamwriter): SUBDIRS += qmlcachegen + qtConfig(xmlstreamwriter): SUBDIRS += qmlcachegen } qtConfig(thread):!android|android_app:!wasm:!rtems { - qtConfig(commandlineparser): SUBDIRS += qml + SUBDIRS += qml qtConfig(qml-profiler): SUBDIRS += qmlprofiler qtConfig(qml-preview): SUBDIRS += qmlpreview |