diff options
Diffstat (limited to 'tests/auto/qml')
-rw-r--r-- | tests/auto/qml/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmlengine/tst_qqmlengine.cpp | 5 | ||||
-rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmlqt/tst_qqmlqt.cpp | 4 |
5 files changed, 18 insertions, 3 deletions
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt index 6302df235d..6b81f4c616 100644 --- a/tests/auto/qml/CMakeLists.txt +++ b/tests/auto/qml/CMakeLists.txt @@ -34,7 +34,9 @@ add_subdirectory(qqmlerror) add_subdirectory(qqmlincubator) add_subdirectory(qqmlinfo) add_subdirectory(qqmllistreference) -add_subdirectory(qqmllocale) +if(QT_FEATURE_qml_locale) + add_subdirectory(qqmllocale) +endif() add_subdirectory(qqmlmetaobject) if(NOT ANDROID) # QTBUG-100003 add_subdirectory(qqmlmoduleplugin) @@ -46,7 +48,9 @@ add_subdirectory(qqmlpromise) add_subdirectory(qtqmlmodules) add_subdirectory(qquickfolderlistmodel) add_subdirectory(qqmlapplicationengine) -add_subdirectory(qqmlsettings) +if(QT_FEATURE_settings) + add_subdirectory(qqmlsettings) +endif() if(NOT INTEGRITY) # There's no mounted filesystem on INTEGRITY therefore skipping qmldiskcache diff --git a/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp b/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp index 76fa1328e7..450560833f 100644 --- a/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp +++ b/tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp @@ -145,9 +145,11 @@ void tst_qjsonbinding::cppJsConversion() { QJSValue jsValue = eng.toScriptValue(jsonValue); +#if QT_DEPRECATED_SINCE(6, 9) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED QVERIFY(!jsValue.isVariant()); QT_WARNING_POP +#endif switch (jsonValue.type()) { case QJsonValue::Null: QVERIFY(jsValue.isNull()); diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp index 56140836bf..3c25d29dfb 100644 --- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp +++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp @@ -36,8 +36,10 @@ public: private slots: void initTestCase() override; void rootContext(); +#if QT_CONFIG(qml_network) void networkAccessManager(); void synchronousNetworkAccessManager(); +#endif void baseUrl(); void contextForObject(); void offlineStoragePath(); @@ -153,6 +155,7 @@ void tst_qqmlengine::rootContext() QVERIFY(!engine.rootContext()->parentContext()); } +#if QT_CONFIG(qml_network) class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory { public: @@ -228,7 +231,7 @@ void tst_qqmlengine::synchronousNetworkAccessManager() // reply is finished, so should not be in loading state. QVERIFY(!c.isLoading()); } - +#endif void tst_qqmlengine::baseUrl() { diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp index 0e1bb1abc3..e57eb1b65a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp @@ -131,7 +131,9 @@ void registerStaticPlugin(const char *uri) PluginType::metaData.append(char(QT_VERSION_MAJOR)); PluginType::metaData.append(char(QT_VERSION_MINOR)); PluginType::metaData.append(char(qPluginArchRequirements())); +#if QT_CONFIG(cborstreamwriter) PluginType::metaData.append(QCborValue(QCborMap::fromJsonObject(md)).toCbor()); +#endif auto rawMetaDataFunctor = []() -> QPluginMetaData { return {reinterpret_cast<const uchar *>(PluginType::metaData.constData()), size_t(PluginType::metaData.size())}; diff --git a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp index 710bbce17a..9fea41104d 100644 --- a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp +++ b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp @@ -57,8 +57,10 @@ private slots: void alpha(); void tint(); void color(); +#if QT_CONFIG(desktopservices) void openUrlExternally(); void openUrlExternally_pragmaLibrary(); +#endif void md5(); void createComponent(); void createComponent_pragmaLibrary(); @@ -613,6 +615,7 @@ public slots: void noteCall(const QUrl &url) { called++; last = url; } }; +#if QT_CONFIG(desktopservices) void tst_qqmlqt::openUrlExternally() { MyUrlHandler handler; @@ -659,6 +662,7 @@ void tst_qqmlqt::openUrlExternally_pragmaLibrary() QCOMPARE(handler.called,2); QCOMPARE(handler.last, htmlTestFile); } +#endif void tst_qqmlqt::md5() { |