summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-11-12 11:53:30 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-12 17:24:44 +0000
commit76590ce2208e754f87e5b75c0c1de425c34e0b1a (patch)
treed76e16f0a1d211135dcb54c4d2fe344a09c46663 /tests/auto/corelib
parent681e8b4ead432b2658b0be9f90454bbdbd80d1b1 (diff)
Regenerate tests/auto/corelib/io
Change-Id: Ic1d1b5c0deb90800c7219fb8cce4e77e0db145b8 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/io/largefile/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt7
-rw-r--r--tests/auto/corelib/io/qbuffer/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qdataurl/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qdebug/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qdir/CMakeLists.txt24
-rw-r--r--tests/auto/corelib/io/qdiriterator/CMakeLists.txt9
-rw-r--r--tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt3
-rw-r--r--tests/auto/corelib/io/qfileinfo/CMakeLists.txt19
-rw-r--r--tests/auto/corelib/io/qfilesystementry/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qiodevice/CMakeLists.txt18
-rw-r--r--tests/auto/corelib/io/qipaddress/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/io/qloggingcategory/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qloggingregistry/CMakeLists.txt18
-rw-r--r--tests/auto/corelib/io/qnodebug/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qsavefile/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qsettings/CMakeLists.txt21
-rw-r--r--tests/auto/corelib/io/qstandardpaths/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qstorageinfo/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qtemporarydir/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt26
-rw-r--r--tests/auto/corelib/io/qurl/CMakeLists.txt1
-rw-r--r--tests/auto/corelib/io/qurlinternal/CMakeLists.txt8
-rw-r--r--tests/auto/corelib/io/qurlquery/CMakeLists.txt1
30 files changed, 100 insertions, 75 deletions
diff --git a/tests/auto/corelib/io/largefile/CMakeLists.txt b/tests/auto/corelib/io/largefile/CMakeLists.txt
index 7bf8189b73..cb1eba8526 100644
--- a/tests/auto/corelib/io/largefile/CMakeLists.txt
+++ b/tests/auto/corelib/io/largefile/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_largefile
- GUI
SOURCES
../../../../shared/emulationdetector.h
tst_largefile.cpp
diff --git a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
index aac371389f..1c1470cf51 100644
--- a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
+++ b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qabstractfileengine
- GUI
SOURCES
tst_qabstractfileengine.cpp
LIBRARIES
@@ -13,10 +12,14 @@ add_qt_test(tst_qabstractfileengine
)
# Resources:
+set(qabstractfileengine_resource_files
+ "resources/"
+)
+
add_qt_resource(tst_qabstractfileengine "qabstractfileengine"
PREFIX
"/tst_qabstractfileengine/"
FILES
- "resources/"
+ ${qabstractfileengine_resource_files}
)
diff --git a/tests/auto/corelib/io/qbuffer/CMakeLists.txt b/tests/auto/corelib/io/qbuffer/CMakeLists.txt
index 992960de37..40502dd004 100644
--- a/tests/auto/corelib/io/qbuffer/CMakeLists.txt
+++ b/tests/auto/corelib/io/qbuffer/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qbuffer
- GUI
SOURCES
tst_qbuffer.cpp
)
diff --git a/tests/auto/corelib/io/qdataurl/CMakeLists.txt b/tests/auto/corelib/io/qdataurl/CMakeLists.txt
index 479321205e..84f1b5b11a 100644
--- a/tests/auto/corelib/io/qdataurl/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdataurl/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qdataurl
- GUI
SOURCES
tst_qdataurl.cpp
LIBRARIES
diff --git a/tests/auto/corelib/io/qdebug/CMakeLists.txt b/tests/auto/corelib/io/qdebug/CMakeLists.txt
index 15cb6f4e20..d7fa4fb7cd 100644
--- a/tests/auto/corelib/io/qdebug/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdebug/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qdebug
- GUI
SOURCES
tst_qdebug.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt
index 89c79c314c..6ac1e5b46f 100644
--- a/tests/auto/corelib/io/qdir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdir/CMakeLists.txt
@@ -14,7 +14,6 @@ list(APPEND test_data "types")
list(APPEND test_data "tst_qdir.cpp")
add_qt_test(tst_qdir
- GUI
SOURCES
tst_qdir.cpp
LIBRARIES
@@ -23,11 +22,15 @@ add_qt_test(tst_qdir
)
# Resources:
+set(qdir_resource_files
+ "resources/entryList/"
+)
+
add_qt_resource(tst_qdir "qdir"
PREFIX
"/tst_qdir/"
FILES
- "resources/entryList/"
+ ${qdir_resource_files}
)
@@ -42,11 +45,9 @@ extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
BUILTIN_TESTDATA
)
-# Resources:
-add_qt_resource(tst_qdir "android_testdata"
- PREFIX
- "/android_testdata"
- FILES
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+ # Resources:
+ set(android_testdata_resource_files
"entrylist/directory/dummy"
"entrylist/file"
"resources/entryList/file1.data"
@@ -87,5 +88,12 @@ add_qt_resource(tst_qdir "android_testdata"
"types/f.b/dummy"
"types/f.c/dummy"
"types/f/dummy"
-)
+ )
+ add_qt_resource(tst_qdir "android_testdata"
+ PREFIX
+ "/android_testdata"
+ FILES
+ ${android_testdata_resource_files}
+ )
+endif()
diff --git a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
index cbdfc57314..dd10eb62c3 100644
--- a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
@@ -8,7 +8,6 @@
list(APPEND test_data "entrylist")
add_qt_test(tst_qdiriterator
- GUI
SOURCES
tst_qdiriterator.cpp
LIBRARIES
@@ -17,12 +16,16 @@ add_qt_test(tst_qdiriterator
)
# Resources:
+set(qdiriterator_resource_files
+ "entrylist/directory/dummy"
+ "entrylist/file"
+)
+
add_qt_resource(tst_qdiriterator "qdiriterator"
PREFIX
"/testdata/"
FILES
- "entrylist/directory/dummy"
- "entrylist/file"
+ ${qdiriterator_resource_files}
)
diff --git a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
index 9f12295c9d..994c2fc268 100644
--- a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
@@ -8,6 +8,3 @@ add_qt_test_helper(stdinprocess_helper
SOURCES
main.cpp
)
-
-#### Keys ignored in scope 1:.:.:stdinprocess.pro:<TRUE>:
-# _LOADED = "qt_test_helper"
diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
index d786378b61..03f2e99e37 100644
--- a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qfileinfo
- GUI
SOURCES
tst_qfileinfo.cpp
LIBRARIES
@@ -13,20 +12,28 @@ add_qt_test(tst_qfileinfo
)
# Resources:
+set(qfileinfo_resource_files
+ "resources/"
+)
+
add_qt_resource(tst_qfileinfo "qfileinfo"
PREFIX
"/tst_qfileinfo/"
FILES
- "resources/"
+ ${qfileinfo_resource_files}
)
+set(testdata_resource_files
+ "resources/file1"
+ "resources/file1.ext1"
+ "resources/file1.ext1.ext2"
+ "tst_qfileinfo.cpp"
+)
+
add_qt_resource(tst_qfileinfo "testdata"
PREFIX
"/testdata"
FILES
- "resources/file1"
- "resources/file1.ext1"
- "resources/file1.ext1.ext2"
- "tst_qfileinfo.cpp"
+ ${testdata_resource_files}
)
diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
index fd56528cb2..3643ca6da4 100644
--- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qfilesystementry
- GUI
SOURCES
${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h
tst_qfilesystementry.cpp
diff --git a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
index a6ded42656..fc89314669 100644
--- a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qfilesystemmetadata
- GUI
SOURCES
tst_qfilesystemmetadata.cpp
LIBRARIES
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
index 3230a22a24..1dfef5acab 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qfilesystemwatcher
- GUI
SOURCES
tst_qfilesystemwatcher.cpp
)
diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
index c33870a9c6..6b7833ac22 100644
--- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt
+++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
@@ -8,7 +8,6 @@
list(APPEND test_data "tst_qiodevice.cpp")
add_qt_test(tst_qiodevice
- GUI
SOURCES
tst_qiodevice.cpp
PUBLIC_LIBRARIES
@@ -22,11 +21,16 @@ add_qt_test(tst_qiodevice
## Scopes:
#####################################################################
-# Resources:
-add_qt_resource(tst_qiodevice "android_testdata"
- PREFIX
- "/"
- FILES
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+ # Resources:
+ set(android_testdata_resource_files
"tst_qiodevice.cpp"
-)
+ )
+ add_qt_resource(tst_qiodevice "android_testdata"
+ PREFIX
+ "/"
+ FILES
+ ${android_testdata_resource_files}
+ )
+endif()
diff --git a/tests/auto/corelib/io/qipaddress/CMakeLists.txt b/tests/auto/corelib/io/qipaddress/CMakeLists.txt
index dd44c92cb7..9e0817e445 100644
--- a/tests/auto/corelib/io/qipaddress/CMakeLists.txt
+++ b/tests/auto/corelib/io/qipaddress/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qipaddress
- GUI
SOURCES
tst_qipaddress.cpp
LIBRARIES
diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
index 7d78a407e2..755dc7cf39 100644
--- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
@@ -5,7 +5,7 @@
#####################################################################
add_qt_executable(qlockfile_test_helper
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
+ OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
qlockfile_test_helper.cpp
)
diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
index bb6bc78b77..b515037d56 100644
--- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
+++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
@@ -6,7 +6,7 @@
add_qt_test_helper(qlockfile_test_helper # special case
OVERRIDE_OUTPUT_DIRECTORY # special case
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
+ OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
qlockfile_test_helper.cpp
)
diff --git a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
index dc74cbcedf..ea82bc0370 100644
--- a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
+++ b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qloggingcategory
- GUI
SOURCES
tst_qloggingcategory.cpp
LIBRARIES
diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
index fb70256218..518258d77b 100644
--- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
+++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
@@ -8,7 +8,6 @@
list(APPEND test_data "qtlogging.ini")
add_qt_test(tst_qloggingregistry
- GUI
SOURCES
tst_qloggingregistry.cpp
LIBRARIES
@@ -22,11 +21,16 @@ add_qt_test(tst_qloggingregistry
## Scopes:
#####################################################################
-# Resources:
-add_qt_resource(tst_qloggingregistry "android_testdata"
- PREFIX
- "/"
- FILES
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+ # Resources:
+ set(android_testdata_resource_files
"qtlogging.ini"
-)
+ )
+ add_qt_resource(tst_qloggingregistry "android_testdata"
+ PREFIX
+ "/"
+ FILES
+ ${android_testdata_resource_files}
+ )
+endif()
diff --git a/tests/auto/corelib/io/qnodebug/CMakeLists.txt b/tests/auto/corelib/io/qnodebug/CMakeLists.txt
index 741f9d3ce4..4d1b57e222 100644
--- a/tests/auto/corelib/io/qnodebug/CMakeLists.txt
+++ b/tests/auto/corelib/io/qnodebug/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qnodebug
- GUI
SOURCES
tst_qnodebug.cpp
)
diff --git a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
index ec2b6bf264..ce6195fc37 100644
--- a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(qprocess-noapplication
- GUI
SOURCES
tst_qprocessnoapplication.cpp
)
diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
index eb56b30ac3..dbcd8c8172 100644
--- a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qprocessenvironment
- GUI
SOURCES
tst_qprocessenvironment.cpp
)
diff --git a/tests/auto/corelib/io/qsavefile/CMakeLists.txt b/tests/auto/corelib/io/qsavefile/CMakeLists.txt
index 42f1ae3d46..aec5da1f99 100644
--- a/tests/auto/corelib/io/qsavefile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qsavefile/CMakeLists.txt
@@ -8,7 +8,6 @@
list(APPEND test_data "tst_qsavefile.cpp")
add_qt_test(tst_qsavefile
- GUI
SOURCES
tst_qsavefile.cpp
TESTDATA ${test_data}
diff --git a/tests/auto/corelib/io/qsettings/CMakeLists.txt b/tests/auto/corelib/io/qsettings/CMakeLists.txt
index 4011a13a58..77ae908f93 100644
--- a/tests/auto/corelib/io/qsettings/CMakeLists.txt
+++ b/tests/auto/corelib/io/qsettings/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qsettings
- GUI
SOURCES
tst_qsettings.cpp
DEFINES
@@ -19,18 +18,22 @@ add_qt_test(tst_qsettings
)
# Resources:
+set(qsettings_resource_files
+ "bom.ini"
+ "resourcefile.ini"
+ "resourcefile2.ini"
+ "resourcefile3.ini"
+ "resourcefile4.ini"
+ "resourcefile5.ini"
+ "resourcefile6.plist"
+ "withcomments.ini"
+)
+
add_qt_resource(tst_qsettings "qsettings"
PREFIX
"/"
FILES
- "bom.ini"
- "resourcefile.ini"
- "resourcefile2.ini"
- "resourcefile3.ini"
- "resourcefile4.ini"
- "resourcefile5.ini"
- "resourcefile6.plist"
- "withcomments.ini"
+ ${qsettings_resource_files}
)
diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
index 89b5af5302..5bceaf1d77 100644
--- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
+++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
@@ -9,7 +9,6 @@ list(APPEND test_data "tst_qstandardpaths.cpp")
list(APPEND test_data "qstandardpaths.pro")
add_qt_test(tst_qstandardpaths
- GUI
SOURCES
../../../../shared/emulationdetector.h
tst_qstandardpaths.cpp
diff --git a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
index 2c4db5e829..c3b14dc6db 100644
--- a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
+++ b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qstorageinfo
- GUI
SOURCES
tst_qstorageinfo.cpp
LIBRARIES
diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
index bd8f8140b6..3a106e8453 100644
--- a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qtemporarydir
- GUI
SOURCES
../../../../shared/emulationdetector.h
tst_qtemporarydir.cpp
diff --git a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
index b1c324ca17..693e2c674c 100644
--- a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
+++ b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
@@ -8,7 +8,6 @@
list(APPEND test_data "tst_qtemporaryfile.cpp")
add_qt_test(tst_qtemporaryfile
- GUI
SOURCES
tst_qtemporaryfile.cpp
LIBRARIES
@@ -17,23 +16,32 @@ add_qt_test(tst_qtemporaryfile
)
# Resources:
+set(qtemporaryfile_resource_files
+ "resources/test.txt"
+)
+
add_qt_resource(tst_qtemporaryfile "qtemporaryfile"
PREFIX
"/"
FILES
- "resources/test.txt"
+ ${qtemporaryfile_resource_files}
)
## Scopes:
#####################################################################
-# Resources:
-add_qt_resource(tst_qtemporaryfile "android_testdata"
- PREFIX
- "/android_testdata"
- FILES
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+ # Resources:
+ set(android_testdata_resource_files
"resources/test.txt"
"tst_qtemporaryfile.cpp"
-)
-
+ )
+
+ add_qt_resource(tst_qtemporaryfile "android_testdata"
+ PREFIX
+ "/android_testdata"
+ FILES
+ ${android_testdata_resource_files}
+ )
+endif()
diff --git a/tests/auto/corelib/io/qurl/CMakeLists.txt b/tests/auto/corelib/io/qurl/CMakeLists.txt
index a1b60a1751..c23ad27cfc 100644
--- a/tests/auto/corelib/io/qurl/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurl/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qurl
- GUI
SOURCES
tst_qurl.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
index 21e661a17f..c941d6811c 100644
--- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
@@ -1,14 +1,20 @@
# Generated from qurlinternal.pro.
+if(NOT QT_FEATURE_private_tests)
+ return()
+endif()
+
#####################################################################
## tst_qurlinternal Test:
#####################################################################
add_qt_test(tst_qurlinternal
- GUI
SOURCES
../../codecs/utf8/utf8data.cpp
tst_qurlinternal.cpp
LIBRARIES
Qt::CorePrivate
)
+
+#### Keys ignored in scope 1:.:.:qurlinternal.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/corelib/io/qurlquery/CMakeLists.txt b/tests/auto/corelib/io/qurlquery/CMakeLists.txt
index 0e82c3812c..f35ff284a7 100644
--- a/tests/auto/corelib/io/qurlquery/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurlquery/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qurlquery
- GUI
SOURCES
tst_qurlquery.cpp
DEFINES