diff --git a/tests/auto/corelib/platform/android/CMakeLists.txt b/tests/auto/corelib/platform/android/CMakeLists.txt index 6b7e9b29017..09faa8d53a5 100644 --- a/tests/auto/corelib/platform/android/CMakeLists.txt +++ b/tests/auto/corelib/platform/android/CMakeLists.txt @@ -18,7 +18,6 @@ qt_internal_add_test(tst_android Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::Widgets ) if(ANDROID) @@ -26,3 +25,8 @@ if(ANDROID) ${CMAKE_CURRENT_SOURCE_DIR}/testdata ) endif() + +qt_internal_extend_target(tst_android CONDITION TARGET Qt::Widgets + LIBRARIES + Qt::Widgets +) diff --git a/tests/auto/corelib/platform/android/tst_android.cpp b/tests/auto/corelib/platform/android/tst_android.cpp index 47dce8c6b8c..b9970158027 100644 --- a/tests/auto/corelib/platform/android/tst_android.cpp +++ b/tests/auto/corelib/platform/android/tst_android.cpp @@ -12,7 +12,10 @@ #include #include #include +#include // for widgets feature test +#if QT_CONFIG(widgets) #include +#endif #include using namespace Qt::StringLiterals; @@ -37,9 +40,11 @@ private slots: void testAndroidSdkVersion(); void testAndroidActivity(); void testRunOnAndroidMainThread(); +#if QT_CONFIG(widgets) void testFullScreenDimensions(); void orientationChange_data(); void orientationChange(); +#endif }; void tst_Android::assetsRead() @@ -213,6 +218,7 @@ void tst_Android::testRunOnAndroidMainThread() } } +#if QT_CONFIG(widgets) // QTBUG-107604 void tst_Android::testFullScreenDimensions() { @@ -400,6 +406,7 @@ void tst_Android::orientationChange() QCOMPARE(screen->size(), screenSize); QCOMPARE(widget.size(), screen->availableSize()); } +#endif // QT_CONFIG(widgets) QTEST_MAIN(tst_Android) #include "tst_android.moc"