diff options
author | Tasuku Suzuki <tasuku.suzuki@kdab.com> | 2020-02-27 21:49:19 +0900 |
---|---|---|
committer | Tasuku Suzuki <tasuku.suzuki@kdab.com> | 2020-02-28 00:21:26 +0900 |
commit | 48deaf9a3e323181662d3c031dbe3c729ecc2bee (patch) | |
tree | 68d4e85467370b1ce7dfcb20a8875e151a4e3088 | |
parent | 98d088d6e31c6c1bafea5674c9003d846b572680 (diff) |
Fix build without features.settings
error: static_assert failed due to requirement 'bool(-1 == 1)'
"Required feature settings for file [snip]/qsettings.h not available."
QT_REQUIRE_CONFIG(settings);
Change-Id: I0759f884531179ed5f625f21c5559389aef5c4ad
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r-- | src/plugins/qmltooling/qmltooling.pro | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro index 30097be77b..b5b6e5d7aa 100644 --- a/src/plugins/qmltooling/qmltooling.pro +++ b/src/plugins/qmltooling/qmltooling.pro @@ -36,7 +36,7 @@ qtHaveModule(quick) { qmldbg_inspector \ qmldbg_quickprofiler - qtConfig(qml-network): SUBDIRS += qmldbg_preview + qtConfig(settings):qtConfig(qml-network): SUBDIRS += qmldbg_preview qmldbg_inspector.depends = packetprotocol qmldbg_quickprofiler.depends = packetprotocol diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index c8b41d3684..76be865c9f 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -61,7 +61,6 @@ #include <private/qqmlboundsignal_p.h> #include <private/qqmljsdiagnosticmessage_p.h> #include <QtCore/qstandardpaths.h> -#include <QtCore/qsettings.h> #include <QtCore/qmetaobject.h> #include <QDebug> #include <QtCore/qcoreapplication.h> |