Make autotests configurable without Widgets on Android

tst_android depends on widgets, and parts of the test
needs to be excluded if Qt is configured without them.

Pick-to: 6.9 6.8
Change-Id: Iaca5b4228c0a7bd7c3a2efe9da04f354ac7e7c1c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

Author: Juha Vuolle

tests/auto/corelib/platform/android/CMakeLists.txt

@@ -18,11 +18,15 @@ qt_internal_add_test(tst_android
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
-        Qt::Widgets
 )
 
 if(ANDROID)
     set_property(TARGET tst_android APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
         ${CMAKE_CURRENT_SOURCE_DIR}/testdata
     )
 endif()
+
+qt_internal_extend_target(tst_android CONDITION TARGET Qt::Widgets
+    LIBRARIES
+        Qt::Widgets
+)

tests/auto/corelib/platform/android/tst_android.cpp

@@ -12,7 +12,10 @@
 #include <qpa/qplatformscreen.h>
 #include <qpa/qplatformnativeinterface.h>
 #include <QtCore/qdiriterator.h>
+#include <private/qglobal_p.h>  // for widgets feature test
+#if QT_CONFIG(widgets)
 #include <QWidget>
+#endif
 #include <QSignalSpy>
 
 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"