1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make autotests configurable without Widgets on Android

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

Pick-to: 6.8
Change-Id: Iaca5b4228c0a7bd7c3a2efe9da04f354ac7e7c1c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit bdacb87cef17ff9bab69d843b8c5c14e2a749715)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Juha Vuolle 2025-04-08 16:39:52 +03:00 committed by Qt Cherry-pick Bot
parent bc039f3253
commit 12de520677
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/corelib/platform/android/CMakeLists.txt
View File

@ -18,7 +18,6 @@ qt_internal_add_test(tst_android
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
Qt::Widgets
) )
if(ANDROID) if(ANDROID)
@ -26,3 +25,8 @@ if(ANDROID)
${CMAKE_CURRENT_SOURCE_DIR}/testdata ${CMAKE_CURRENT_SOURCE_DIR}/testdata
) )
endif() endif()
qt_internal_extend_target(tst_android CONDITION TARGET Qt::Widgets
LIBRARIES
Qt::Widgets
)

7
tests/auto/corelib/platform/android/tst_android.cpp
View File

@ -12,7 +12,10 @@
#include <qpa/qplatformscreen.h> #include <qpa/qplatformscreen.h>
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
#include <QtCore/qdiriterator.h> #include <QtCore/qdiriterator.h>
#include <private/qglobal_p.h> // for widgets feature test
#if QT_CONFIG(widgets)
#include <QWidget> #include <QWidget>
#endif
#include <QSignalSpy> #include <QSignalSpy>
using namespace Qt::StringLiterals; using namespace Qt::StringLiterals;
@ -37,9 +40,11 @@ private slots:
void testAndroidSdkVersion(); void testAndroidSdkVersion();
void testAndroidActivity(); void testAndroidActivity();
void testRunOnAndroidMainThread(); void testRunOnAndroidMainThread();
#if QT_CONFIG(widgets)
void testFullScreenDimensions(); void testFullScreenDimensions();
void orientationChange_data(); void orientationChange_data();
void orientationChange(); void orientationChange();
#endif
}; };
void tst_Android::assetsRead() void tst_Android::assetsRead()
@ -213,6 +218,7 @@ void tst_Android::testRunOnAndroidMainThread()
} }
} }
#if QT_CONFIG(widgets)
// QTBUG-107604 // QTBUG-107604
void tst_Android::testFullScreenDimensions() void tst_Android::testFullScreenDimensions()
{ {
@ -400,6 +406,7 @@ void tst_Android::orientationChange()
QCOMPARE(screen->size(), screenSize); QCOMPARE(screen->size(), screenSize);
QCOMPARE(widget.size(), screen->availableSize()); QCOMPARE(widget.size(), screen->availableSize());
} }
#endif // QT_CONFIG(widgets)
QTEST_MAIN(tst_Android) QTEST_MAIN(tst_Android)
#include "tst_android.moc" #include "tst_android.moc"