diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-09 13:07:26 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-17 17:30:14 +0200 |
| commit | 7a4b586f4b8d1b73d1af3d24ff5112e4dc231ea6 (patch) | |
| tree | fddc569efaeeb8147b80c0d7c3aae60f5c623fd7 /tests/auto/corelib/kernel/qtranslator | |
| parent | d8fd2425fb37b5f745e385552b11dc4cdcffb5ff (diff) | |
Remove conditioning on Android embedded
It is no longer handled separately from Android.
This effectively reverts commit 6d50f746fe05a7008b63818e77784dd0c99270a1
Change-Id: Ic2d75b8c5a09895810913311ab2fe3355d4d2983
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'tests/auto/corelib/kernel/qtranslator')
| -rw-r--r-- | tests/auto/corelib/kernel/qtranslator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt index 1c7de81d71..e3e69537bf 100644 --- a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt @@ -28,7 +28,7 @@ qt_internal_add_resource(tst_qtranslator "qtranslator" ## Scopes: ##################################################################### -if(ANDROID AND NOT ANDROID_EMBEDDED) +if(ANDROID) # Resources: set(android_testdata_resource_files "dependencies_la.qm" diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp index 6ce223cbd2..9f0efac63a 100644 --- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp +++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -34,7 +34,7 @@ #include <qfile.h> #include <qtemporarydir.h> -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) +#ifdef Q_OS_ANDROID #include <QDirIterator> #endif |