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

CMake: Regenerate tests with new qt_ prefixed APIs

Browse Source 
Use pro2cmake with '--api-version 2' to force regenerate
projects to use the new prefixed qt_foo APIs.

Change-Id: I055c4837860319e93aaa6b09d646dda4fc2a4069
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-07-07 18:01:06 +02:00
parent 5417f1e40c
commit e9a328bc0e
688 changed files with 881 additions and 883 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qtconcurrentiteratekernel Test:
#####################################################################
add_qt_test(tst_qtconcurrentiteratekernel
qt_add_test(tst_qtconcurrentiteratekernel
SOURCES
tst_qtconcurrentiteratekernel.cpp
PUBLIC_LIBRARIES

2
tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qtconcurrentmedian Test:
#####################################################################
add_qt_test(tst_qtconcurrentmedian
qt_add_test(tst_qtconcurrentmedian
SOURCES
tst_qtconcurrentmedian.cpp
PUBLIC_LIBRARIES

2
tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qtconcurrentrun Test:
#####################################################################
add_qt_test(tst_qtconcurrentrun
qt_add_test(tst_qtconcurrentrun
SOURCES
tst_qtconcurrentrun.cpp
PUBLIC_LIBRARIES

2
tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qtconcurrenttask Test:
#####################################################################
add_qt_test(tst_qtconcurrenttask
qt_add_test(tst_qtconcurrenttask
SOURCES
tst_qtconcurrenttask.cpp
PUBLIC_LIBRARIES

2
tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qtconcurrentthreadengine Test:
#####################################################################
add_qt_test(tst_qtconcurrentthreadengine
qt_add_test(tst_qtconcurrentthreadengine
SOURCES
tst_qtconcurrentthreadengine.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qabstractanimation Test:
#####################################################################
add_qt_test(tst_qabstractanimation
qt_add_test(tst_qabstractanimation
SOURCES
tst_qabstractanimation.cpp
)

2
tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qanimationgroup Test:
#####################################################################
add_qt_test(tst_qanimationgroup
qt_add_test(tst_qanimationgroup
SOURCES
tst_qanimationgroup.cpp
)

2
tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qparallelanimationgroup Test:
#####################################################################
add_qt_test(tst_qparallelanimationgroup
qt_add_test(tst_qparallelanimationgroup
SOURCES
tst_qparallelanimationgroup.cpp
)

2
tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qpauseanimation Test:
#####################################################################
add_qt_test(tst_qpauseanimation
qt_add_test(tst_qpauseanimation
SOURCES
tst_qpauseanimation.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qsequentialanimationgroup Test:
#####################################################################
add_qt_test(tst_qsequentialanimationgroup
qt_add_test(tst_qsequentialanimationgroup
SOURCES
tst_qsequentialanimationgroup.cpp
)

2
tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qvariantanimation Test:
#####################################################################
add_qt_test(tst_qvariantanimation
qt_add_test(tst_qvariantanimation
SOURCES
tst_qvariantanimation.cpp
)

2
tests/auto/corelib/global/q_func_info/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_q_func_info Test:
#####################################################################
add_qt_test(tst_q_func_info
qt_add_test(tst_q_func_info
SOURCES
tst_q_func_info.cpp
)

2
tests/auto/corelib/global/qflags/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qflags Test:
#####################################################################
add_qt_test(tst_qflags
qt_add_test(tst_qflags
SOURCES
tst_qflags.cpp
)

2
tests/auto/corelib/global/qfloat16/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qfloat16 Test:
#####################################################################
add_qt_test(tst_qfloat16
qt_add_test(tst_qfloat16
SOURCES
tst_qfloat16.cpp
)

2
tests/auto/corelib/global/qgetputenv/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qgetputenv Test:
#####################################################################
add_qt_test(tst_qgetputenv
qt_add_test(tst_qgetputenv
SOURCES
tst_qgetputenv.cpp
)

2
tests/auto/corelib/global/qglobal/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qglobal Test:
#####################################################################
add_qt_test(tst_qglobal
qt_add_test(tst_qglobal
SOURCES
qglobal.c
tst_qglobal.cpp

2
tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qglobalstatic Test:
#####################################################################
add_qt_test(tst_qglobalstatic
qt_add_test(tst_qglobalstatic
EXCEPTIONS
SOURCES
tst_qglobalstatic.cpp

2
tests/auto/corelib/global/qhooks/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qhooks Test:
#####################################################################
add_qt_test(tst_qhooks
qt_add_test(tst_qhooks
SOURCES
tst_qhooks.cpp
PUBLIC_LIBRARIES

6
tests/auto/corelib/global/qnumeric/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qnumeric Test:
#####################################################################
add_qt_test(tst_qnumeric
qt_add_test(tst_qnumeric
SOURCES
tst_qnumeric.cpp
PUBLIC_LIBRARIES
@ -14,13 +14,13 @@ add_qt_test(tst_qnumeric
## Scopes:
#####################################################################
extend_target(tst_qnumeric CONDITION ICC
qt_extend_target(tst_qnumeric CONDITION ICC
COMPILE_OPTIONS
-fp-model
strict
)
extend_target(tst_qnumeric CONDITION intel_icl
qt_extend_target(tst_qnumeric CONDITION intel_icl
COMPILE_OPTIONS
/fp:strict
)

2
tests/auto/corelib/global/qrand/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qrand Test:
#####################################################################
add_qt_test(tst_qrand
qt_add_test(tst_qrand
SOURCES
tst_qrand.cpp
)

2
tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qrandomgenerator Test:
#####################################################################
add_qt_test(tst_qrandomgenerator
qt_add_test(tst_qrandomgenerator
SOURCES
tst_qrandomgenerator.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/global/qtendian/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qtendian Test:
#####################################################################
add_qt_test(tst_qtendian
qt_add_test(tst_qtendian
SOURCES
tst_qtendian.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/io/largefile/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_largefile Test:
#####################################################################
add_qt_test(tst_largefile
qt_add_test(tst_largefile
SOURCES
../../../../shared/emulationdetector.h
tst_largefile.cpp

4
tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qabstractfileengine Test:
#####################################################################
add_qt_test(tst_qabstractfileengine
qt_add_test(tst_qabstractfileengine
SOURCES
tst_qabstractfileengine.cpp
PUBLIC_LIBRARIES
@ -16,7 +16,7 @@ set(qabstractfileengine_resource_files
"resources/"
)
add_qt_resource(tst_qabstractfileengine "qabstractfileengine"
qt_add_resource(tst_qabstractfileengine "qabstractfileengine"
PREFIX
"/tst_qabstractfileengine/"
FILES

2
tests/auto/corelib/io/qbuffer/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qbuffer Test:
#####################################################################
add_qt_test(tst_qbuffer
qt_add_test(tst_qbuffer
SOURCES
tst_qbuffer.cpp
)

2
tests/auto/corelib/io/qdataurl/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qdataurl Test:
#####################################################################
add_qt_test(tst_qdataurl
qt_add_test(tst_qdataurl
SOURCES
tst_qdataurl.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/io/qdebug/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qdebug Test:
#####################################################################
add_qt_test(tst_qdebug
qt_add_test(tst_qdebug
SOURCES
tst_qdebug.cpp
PUBLIC_LIBRARIES

8
tests/auto/corelib/io/qdir/CMakeLists.txt
View File

@ -13,7 +13,7 @@ list(APPEND test_data "entrylist")
list(APPEND test_data "types")
list(APPEND test_data "tst_qdir.cpp")
add_qt_test(tst_qdir
qt_add_test(tst_qdir
SOURCES
tst_qdir.cpp
PUBLIC_LIBRARIES
@ -26,7 +26,7 @@ set(qdir_resource_files
"resources/entryList/"
)
add_qt_resource(tst_qdir "qdir"
qt_add_resource(tst_qdir "qdir"
PREFIX
"/tst_qdir/"
FILES
@ -40,7 +40,7 @@ add_qt_resource(tst_qdir "qdir"
#### Keys ignored in scope 2:.:.:qdir.pro:IOS:
# QMAKE_INFO_PLIST = "Info.plist"
extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
qt_extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
DEFINES
BUILTIN_TESTDATA
)
@ -90,7 +90,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"types/f/dummy"
)
add_qt_resource(tst_qdir "android_testdata"
qt_add_resource(tst_qdir "android_testdata"
PREFIX
"/android_testdata"
FILES

2
tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## qdir Binary:
#####################################################################
add_qt_executable(qdir
qt_add_executable(qdir
GUI
DEFINES
QT_DISABLE_DEPRECATED_BEFORE=0

6
tests/auto/corelib/io/qdiriterator/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "entrylist")
add_qt_test(tst_qdiriterator
qt_add_test(tst_qdiriterator
SOURCES
tst_qdiriterator.cpp
PUBLIC_LIBRARIES
@ -21,7 +21,7 @@ set(qdiriterator_resource_files
"entrylist/file"
)
add_qt_resource(tst_qdiriterator "qdiriterator"
qt_add_resource(tst_qdiriterator "qdiriterator"
PREFIX
"/testdata/"
FILES
@ -32,7 +32,7 @@ add_qt_resource(tst_qdiriterator "qdiriterator"
## Scopes:
#####################################################################
extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata
qt_extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata
DEFINES
BUILTIN_TESTDATA
)

2
tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## stdinprocess_helper Binary:
#####################################################################
add_qt_test_helper(stdinprocess_helper
qt_add_test_helper(stdinprocess_helper
SOURCES
main.cpp
)

8
tests/auto/corelib/io/qfileinfo/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qfileinfo Test:
#####################################################################
add_qt_test(tst_qfileinfo
qt_add_test(tst_qfileinfo
SOURCES
tst_qfileinfo.cpp
PUBLIC_LIBRARIES
@ -16,7 +16,7 @@ set(qfileinfo_resource_files
"resources/"
)
add_qt_resource(tst_qfileinfo "qfileinfo"
qt_add_resource(tst_qfileinfo "qfileinfo"
PREFIX
"/tst_qfileinfo/"
FILES
@ -29,7 +29,7 @@ set(testdata_resource_files
"tst_qfileinfo.cpp"
)
add_qt_resource(tst_qfileinfo "testdata"
qt_add_resource(tst_qfileinfo "testdata"
PREFIX
"/testdata"
FILES
@ -40,7 +40,7 @@ add_qt_resource(tst_qfileinfo "testdata"
## Scopes:
#####################################################################
extend_target(tst_qfileinfo CONDITION WIN32
qt_extend_target(tst_qfileinfo CONDITION WIN32
PUBLIC_LIBRARIES
advapi32
netapi32

2
tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qfilesystementry Test:
#####################################################################
add_qt_test(tst_qfilesystementry
qt_add_test(tst_qfilesystementry
SOURCES
${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h
tst_qfilesystementry.cpp

2
tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qfilesystemmetadata Test:
#####################################################################
add_qt_test(tst_qfilesystemmetadata
qt_add_test(tst_qfilesystemmetadata
SOURCES
tst_qfilesystemmetadata.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qfilesystemwatcher Test:
#####################################################################
add_qt_test(tst_qfilesystemwatcher
qt_add_test(tst_qfilesystemwatcher
SOURCES
tst_qfilesystemwatcher.cpp
)

4
tests/auto/corelib/io/qiodevice/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "tst_qiodevice.cpp")
add_qt_test(tst_qiodevice
qt_add_test(tst_qiodevice
SOURCES
tst_qiodevice.cpp
PUBLIC_LIBRARIES
@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"tst_qiodevice.cpp"
)
add_qt_resource(tst_qiodevice "android_testdata"
qt_add_resource(tst_qiodevice "android_testdata"
PREFIX
"/"
FILES

2
tests/auto/corelib/io/qipaddress/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qipaddress Test:
#####################################################################
add_qt_test(tst_qipaddress
qt_add_test(tst_qipaddress
SOURCES
tst_qipaddress.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## qlockfile_test_helper Binary:
#####################################################################
add_qt_executable(qlockfile_test_helper
qt_add_executable(qlockfile_test_helper
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
qlockfile_test_helper.cpp

2
tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## qlockfile_test_helper Binary:
#####################################################################
add_qt_test_helper(qlockfile_test_helper # special case
qt_add_test_helper(qlockfile_test_helper # special case
OVERRIDE_OUTPUT_DIRECTORY # special case
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES

2
tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qloggingcategory Test:
#####################################################################
add_qt_test(tst_qloggingcategory
qt_add_test(tst_qloggingcategory
SOURCES
tst_qloggingcategory.cpp
PUBLIC_LIBRARIES

4
tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "qtlogging.ini")
add_qt_test(tst_qloggingregistry
qt_add_test(tst_qloggingregistry
SOURCES
tst_qloggingregistry.cpp
PUBLIC_LIBRARIES
@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"qtlogging.ini"
)
add_qt_resource(tst_qloggingregistry "android_testdata"
qt_add_resource(tst_qloggingregistry "android_testdata"
PREFIX
"/"
FILES

2
tests/auto/corelib/io/qnodebug/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qnodebug Test:
#####################################################################
add_qt_test(tst_qnodebug
qt_add_test(tst_qnodebug
SOURCES
tst_qnodebug.cpp
)

2
tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## qprocess-noapplication Test:
#####################################################################
add_qt_test(qprocess-noapplication
qt_add_test(qprocess-noapplication
SOURCES
tst_qprocessnoapplication.cpp
)

2
tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qprocessenvironment Test:
#####################################################################
add_qt_test(tst_qprocessenvironment
qt_add_test(tst_qprocessenvironment
SOURCES
tst_qprocessenvironment.cpp
)

2
tests/auto/corelib/io/qsavefile/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "tst_qsavefile.cpp")
add_qt_test(tst_qsavefile
qt_add_test(tst_qsavefile
SOURCES
tst_qsavefile.cpp
TESTDATA ${test_data}

8
tests/auto/corelib/io/qsettings/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qsettings Test:
#####################################################################
add_qt_test(tst_qsettings
qt_add_test(tst_qsettings
SOURCES
tst_qsettings.cpp
DEFINES
@ -28,7 +28,7 @@ set(qsettings_resource_files
"withcomments.ini"
)
add_qt_resource(tst_qsettings "qsettings"
qt_add_resource(tst_qsettings "qsettings"
PREFIX
"/"
FILES
@ -39,12 +39,12 @@ add_qt_resource(tst_qsettings "qsettings"
## Scopes:
#####################################################################
extend_target(tst_qsettings CONDITION MSVC
qt_extend_target(tst_qsettings CONDITION MSVC
PUBLIC_LIBRARIES
advapi32
)
extend_target(tst_qsettings CONDITION APPLE
qt_extend_target(tst_qsettings CONDITION APPLE
PUBLIC_LIBRARIES
${FWCoreFoundation}
)

4
tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
View File

@ -8,7 +8,7 @@
list(APPEND test_data "tst_qstandardpaths.cpp")
list(APPEND test_data "qstandardpaths.pro")
add_qt_test(tst_qstandardpaths
qt_add_test(tst_qstandardpaths
SOURCES
../../../../shared/emulationdetector.h
tst_qstandardpaths.cpp
@ -20,7 +20,7 @@ add_qt_test(tst_qstandardpaths
## Scopes:
#####################################################################
extend_target(tst_qstandardpaths CONDITION boot2qt
qt_extend_target(tst_qstandardpaths CONDITION boot2qt
DEFINES
SKIP_FINDEXECUTABLE
)

2
tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qstorageinfo Test:
#####################################################################
add_qt_test(tst_qstorageinfo
qt_add_test(tst_qstorageinfo
SOURCES
tst_qstorageinfo.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qtemporarydir Test:
#####################################################################
add_qt_test(tst_qtemporarydir
qt_add_test(tst_qtemporarydir
SOURCES
../../../../shared/emulationdetector.h
tst_qtemporarydir.cpp

6
tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "tst_qtemporaryfile.cpp")
add_qt_test(tst_qtemporaryfile
qt_add_test(tst_qtemporaryfile
SOURCES
tst_qtemporaryfile.cpp
PUBLIC_LIBRARIES
@ -20,7 +20,7 @@ set(qtemporaryfile_resource_files
"resources/test.txt"
)
add_qt_resource(tst_qtemporaryfile "qtemporaryfile"
qt_add_resource(tst_qtemporaryfile "qtemporaryfile"
PREFIX
"/"
FILES
@ -38,7 +38,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"tst_qtemporaryfile.cpp"
)
add_qt_resource(tst_qtemporaryfile "android_testdata"
qt_add_resource(tst_qtemporaryfile "android_testdata"
PREFIX
"/android_testdata"
FILES

4
tests/auto/corelib/io/qurl/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qurl Test:
#####################################################################
add_qt_test(tst_qurl
qt_add_test(tst_qurl
SOURCES
tst_qurl.cpp
PUBLIC_LIBRARIES
@ -14,7 +14,7 @@ add_qt_test(tst_qurl
## Scopes:
#####################################################################
extend_target(tst_qurl CONDITION APPLE
qt_extend_target(tst_qurl CONDITION APPLE
SOURCES
tst_qurl_mac.mm
)

2
tests/auto/corelib/io/qurlinternal/CMakeLists.txt
View File

@ -8,7 +8,7 @@ endif()
## tst_qurlinternal Test:
#####################################################################
add_qt_test(tst_qurlinternal
qt_add_test(tst_qurlinternal
SOURCES
tst_qurlinternal.cpp
utf8data.cpp

2
tests/auto/corelib/io/qurlquery/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qurlquery Test:
#####################################################################
add_qt_test(tst_qurlquery
qt_add_test(tst_qurlquery
SOURCES
tst_qurlquery.cpp
DEFINES

2
tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qabstractitemmodel Test:
#####################################################################
add_qt_test(tst_qabstractitemmodel
qt_add_test(tst_qabstractitemmodel
SOURCES
../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
tst_qabstractitemmodel.cpp

2
tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qabstractproxymodel Test:
#####################################################################
add_qt_test(tst_qabstractproxymodel
qt_add_test(tst_qabstractproxymodel
SOURCES
tst_qabstractproxymodel.cpp
DEFINES

2
tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qconcatenatetablesproxymodel Test:
#####################################################################
add_qt_test(tst_qconcatenatetablesproxymodel
qt_add_test(tst_qconcatenatetablesproxymodel
SOURCES
tst_qconcatenatetablesproxymodel.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qidentityproxymodel Test:
#####################################################################
add_qt_test(tst_qidentityproxymodel
qt_add_test(tst_qidentityproxymodel
SOURCES
../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
tst_qidentityproxymodel.cpp

2
tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qitemmodel Test:
#####################################################################
add_qt_test(tst_qitemmodel
qt_add_test(tst_qitemmodel
SOURCES
tst_qitemmodel.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qitemselectionmodel Test:
#####################################################################
add_qt_test(tst_qitemselectionmodel
qt_add_test(tst_qitemselectionmodel
SOURCES
tst_qitemselectionmodel.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qsortfilterproxymodel_recursive Test:
#####################################################################
add_qt_test(tst_qsortfilterproxymodel_recursive
qt_add_test(tst_qsortfilterproxymodel_recursive
SOURCES
tst_qsortfilterproxymodel_recursive.cpp
DEFINES

2
tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qsortfilterproxymodel_regularexpression Test:
#####################################################################
add_qt_test(tst_qsortfilterproxymodel_regularexpression
qt_add_test(tst_qsortfilterproxymodel_regularexpression
SOURCES
../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h

2
tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qstringlistmodel Test:
#####################################################################
add_qt_test(tst_qstringlistmodel
qt_add_test(tst_qstringlistmodel
SOURCES
qmodellistener.h
tst_qstringlistmodel.cpp

2
tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qtransposeproxymodel Test:
#####################################################################
add_qt_test(tst_qtransposeproxymodel
qt_add_test(tst_qtransposeproxymodel
SOURCES
tst_qtransposeproxymodel.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qdeadlinetimer Test:
#####################################################################
add_qt_test(tst_qdeadlinetimer
qt_add_test(tst_qdeadlinetimer
SOURCES
tst_qdeadlinetimer.cpp
)

2
tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qelapsedtimer Test:
#####################################################################
add_qt_test(tst_qelapsedtimer
qt_add_test(tst_qelapsedtimer
SOURCES
tst_qelapsedtimer.cpp
)

2
tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qeventdispatcher Test:
#####################################################################
add_qt_test(tst_qeventdispatcher
qt_add_test(tst_qeventdispatcher
SOURCES
tst_qeventdispatcher.cpp
)

6
tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qeventloop Test:
#####################################################################
add_qt_test(tst_qeventloop
qt_add_test(tst_qeventloop
SOURCES
tst_qeventloop.cpp
PUBLIC_LIBRARIES
@ -15,12 +15,12 @@ add_qt_test(tst_qeventloop
## Scopes:
#####################################################################
extend_target(tst_qeventloop CONDITION WIN32
qt_extend_target(tst_qeventloop CONDITION WIN32
PUBLIC_LIBRARIES
user32
)
extend_target(tst_qeventloop CONDITION QT_FEATURE_glib
qt_extend_target(tst_qeventloop CONDITION QT_FEATURE_glib
DEFINES
HAVE_GLIB
)

2
tests/auto/corelib/kernel/qmath/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qmath Test:
#####################################################################
add_qt_test(tst_qmath
qt_add_test(tst_qmath
SOURCES
tst_qmath.cpp
)

2
tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qmetaenum Test:
#####################################################################
add_qt_test(tst_qmetaenum
qt_add_test(tst_qmetaenum
SOURCES
tst_qmetaenum.cpp
)

2
tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qmetamethod Test:
#####################################################################
add_qt_test(tst_qmetamethod
qt_add_test(tst_qmetamethod
SOURCES
tst_qmetamethod.cpp
)

2
tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qmetaobject Test:
#####################################################################
add_qt_test(tst_qmetaobject
qt_add_test(tst_qmetaobject
SOURCES
tst_qmetaobject.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qmetaobjectbuilder Test:
#####################################################################
add_qt_test(tst_qmetaobjectbuilder
qt_add_test(tst_qmetaobjectbuilder
SOURCES
tst_qmetaobjectbuilder.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qmetaproperty Test:
#####################################################################
add_qt_test(tst_qmetaproperty
qt_add_test(tst_qmetaproperty
SOURCES
tst_qmetaproperty.cpp
)

6
tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "./typeFlags.bin")
add_qt_test(tst_qmetatype
qt_add_test(tst_qmetatype
SOURCES
tst_qmetatype.cpp
DEFINES
@ -22,7 +22,7 @@ add_qt_test(tst_qmetatype
## Scopes:
#####################################################################
extend_target(tst_qmetatype CONDITION MSVC
qt_extend_target(tst_qmetatype CONDITION MSVC
COMPILE_OPTIONS
/bigobj
)
@ -31,7 +31,7 @@ extend_target(tst_qmetatype CONDITION MSVC
# QMAKE_CFLAGS_RELEASE = "--O2" "--g"
# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
DEFINES
TST_QMETATYPE_BROKEN_COMPILER
)

6
tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "./typeFlags.bin")
add_qt_test(tst_qmetatype
qt_add_test(tst_qmetatype
SOURCES
tst_qmetatype.cpp
DEFINES
@ -23,7 +23,7 @@ add_qt_test(tst_qmetatype
## Scopes:
#####################################################################
extend_target(tst_qmetatype CONDITION MSVC
qt_extend_target(tst_qmetatype CONDITION MSVC
COMPILE_OPTIONS
/bigobj
)
@ -32,7 +32,7 @@ extend_target(tst_qmetatype CONDITION MSVC
# QMAKE_CFLAGS_RELEASE = "--O2" "--g"
# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
DEFINES
TST_QMETATYPE_BROKEN_COMPILER
)

2
tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qmimedata Test:
#####################################################################
add_qt_test(tst_qmimedata
qt_add_test(tst_qmimedata
SOURCES
tst_qmimedata.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## signalbug_helper Binary:
#####################################################################
add_qt_test_helper(signalbug_helper
qt_add_test_helper(signalbug_helper
SOURCES
signalbug.cpp signalbug.h
)

4
tests/auto/corelib/kernel/qpointer/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qpointer Test:
#####################################################################
add_qt_test(tst_qpointer
qt_add_test(tst_qpointer
SOURCES
tst_qpointer.cpp
)
@ -12,7 +12,7 @@ add_qt_test(tst_qpointer
## Scopes:
#####################################################################
extend_target(tst_qpointer CONDITION TARGET Qt::Widgets
qt_extend_target(tst_qpointer CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)

2
tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## producerconsumer_helper Binary:
#####################################################################
add_qt_test_helper(producerconsumer_helper
qt_add_test_helper(producerconsumer_helper
SOURCES
main.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qsignalblocker Test:
#####################################################################
add_qt_test(tst_qsignalblocker
qt_add_test(tst_qsignalblocker
SOURCES
tst_qsignalblocker.cpp
)

2
tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qsignalmapper Test:
#####################################################################
add_qt_test(tst_qsignalmapper
qt_add_test(tst_qsignalmapper
SOURCES
tst_qsignalmapper.cpp
)

4
tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
View File

@ -8,7 +8,7 @@ endif()
## tst_qsocketnotifier Test:
#####################################################################
add_qt_test(tst_qsocketnotifier
qt_add_test(tst_qsocketnotifier
SOURCES
tst_qsocketnotifier.cpp
INCLUDE_DIRECTORIES
@ -25,7 +25,7 @@ add_qt_test(tst_qsocketnotifier
## Scopes:
#####################################################################
extend_target(tst_qsocketnotifier CONDITION WIN32
qt_extend_target(tst_qsocketnotifier CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)

2
tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## acquirerelease_helper Binary:
#####################################################################
add_qt_test_helper(acquirerelease_helper
qt_add_test_helper(acquirerelease_helper
SOURCES
main.cpp
PUBLIC_LIBRARIES

2
tests/auto/corelib/kernel/qtimer/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qtimer Test:
#####################################################################
add_qt_test(tst_qtimer
qt_add_test(tst_qtimer
SOURCES
tst_qtimer.cpp
PUBLIC_LIBRARIES

6
tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qtranslator Test:
#####################################################################
add_qt_test(tst_qtranslator
qt_add_test(tst_qtranslator
SOURCES
tst_qtranslator.cpp
)
@ -15,7 +15,7 @@ set(qtranslator_resource_files
"hellotr_la.qm"
)
add_qt_resource(tst_qtranslator "qtranslator"
qt_add_resource(tst_qtranslator "qtranslator"
PREFIX
"/tst_qtranslator"
FILES
@ -35,7 +35,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
"msgfmt_from_po.qm"
)
add_qt_resource(tst_qtranslator "android_testdata"
qt_add_resource(tst_qtranslator "android_testdata"
PREFIX
"/android_testdata"
FILES

6
tests/auto/corelib/kernel/qvariant/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qvariant Test:
#####################################################################
add_qt_test(tst_qvariant
qt_add_test(tst_qvariant
SOURCES
tst_qvariant.cpp
DEFINES
@ -21,7 +21,7 @@ set(qvariant_resource_files
"stream/qt5.0/"
)
add_qt_resource(tst_qvariant "qvariant"
qt_add_resource(tst_qvariant "qvariant"
PREFIX
"/"
FILES
@ -32,7 +32,7 @@ add_qt_resource(tst_qvariant "qvariant"
## Scopes:
#####################################################################
extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
qt_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
DEFINES
QT_NO_DOUBLECONVERSION
)

2
tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qwineventnotifier Test:
#####################################################################
add_qt_test(tst_qwineventnotifier
qt_add_test(tst_qwineventnotifier
SOURCES
tst_qwineventnotifier.cpp
PUBLIC_LIBRARIES

14
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
View File

@ -8,7 +8,7 @@ endif()
## tst_qmimedatabase-cache Test:
#####################################################################
add_qt_test(tst_qmimedatabase-cache
qt_add_test(tst_qmimedatabase-cache
SOURCES
../tst_qmimedatabase.h
tst_qmimedatabase-cache.cpp
@ -17,18 +17,18 @@ add_qt_test(tst_qmimedatabase-cache
)
# Resources:
set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
set(mimetypes_resource_files
"mime/packages/freedesktop.org.xml"
)
add_qt_resource(tst_qmimedatabase-cache "mimetypes"
qt_add_resource(tst_qmimedatabase-cache "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"
BASE
"/devel/work/qt-cmake/qtbase/src/corelib/mimetypes"
"/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
FILES
${mimetypes_resource_files}
)
@ -75,7 +75,7 @@ set(testdata_resource_files
"yast2-metapackage-handler-mimetypes.xml"
)
add_qt_resource(tst_qmimedatabase-cache "testdata"
qt_add_resource(tst_qmimedatabase-cache "testdata"
PREFIX
"/qt-project.org/qmime"
BASE
@ -91,7 +91,7 @@ add_qt_resource(tst_qmimedatabase-cache "testdata"
## Scopes:
#####################################################################
extend_target(tst_qmimedatabase-cache CONDITION GCC
qt_extend_target(tst_qmimedatabase-cache CONDITION GCC
COMPILE_OPTIONS
-W
-Wall
@ -101,7 +101,7 @@ extend_target(tst_qmimedatabase-cache CONDITION GCC
-Wshadow
)
extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
qt_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
DEFINES
USE_XDG_DATA_DIRS
)

8
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
View File

@ -8,7 +8,7 @@ endif()
## tst_qmimedatabase-cache Test:
#####################################################################
add_qt_test(tst_qmimedatabase-cache
qt_add_test(tst_qmimedatabase-cache
SOURCES
../tst_qmimedatabase.h
tst_qmimedatabase-cache.cpp
@ -66,7 +66,7 @@ set(testdata_resource_files
"yast2-metapackage-handler-mimetypes.xml"
)
add_qt_resource(tst_qmimedatabase-cache "testdata"
qt_add_resource(tst_qmimedatabase-cache "testdata"
PREFIX
"/qt-project.org/qmime"
BASE
@ -87,7 +87,7 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-cache)
## Scopes:
#####################################################################
extend_target(tst_qmimedatabase-cache CONDITION GCC
qt_extend_target(tst_qmimedatabase-cache CONDITION GCC
COMPILE_OPTIONS
-W
-Wall
@ -97,7 +97,7 @@ extend_target(tst_qmimedatabase-cache CONDITION GCC
-Wshadow
)
extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
qt_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
DEFINES
USE_XDG_DATA_DIRS
)

14
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
View File

@ -8,7 +8,7 @@ endif()
## tst_qmimedatabase-xml Test:
#####################################################################
add_qt_test(tst_qmimedatabase-xml
qt_add_test(tst_qmimedatabase-xml
SOURCES
../tst_qmimedatabase.h
tst_qmimedatabase-xml.cpp
@ -17,18 +17,18 @@ add_qt_test(tst_qmimedatabase-xml
)
# Resources:
set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
set(mimetypes_resource_files
"mime/packages/freedesktop.org.xml"
)
add_qt_resource(tst_qmimedatabase-xml "mimetypes"
qt_add_resource(tst_qmimedatabase-xml "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"
BASE
"/devel/work/qt-cmake/qtbase/src/corelib/mimetypes"
"/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
FILES
${mimetypes_resource_files}
)
@ -75,7 +75,7 @@ set(testdata_resource_files
"yast2-metapackage-handler-mimetypes.xml"
)
add_qt_resource(tst_qmimedatabase-xml "testdata"
qt_add_resource(tst_qmimedatabase-xml "testdata"
PREFIX
"/qt-project.org/qmime"
BASE
@ -91,7 +91,7 @@ add_qt_resource(tst_qmimedatabase-xml "testdata"
## Scopes:
#####################################################################
extend_target(tst_qmimedatabase-xml CONDITION GCC
qt_extend_target(tst_qmimedatabase-xml CONDITION GCC
COMPILE_OPTIONS
-W
-Wall
@ -101,7 +101,7 @@ extend_target(tst_qmimedatabase-xml CONDITION GCC
-Wshadow
)
extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
qt_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
DEFINES
USE_XDG_DATA_DIRS
)

8
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
View File

@ -8,7 +8,7 @@ endif()
## tst_qmimedatabase-xml Test:
#####################################################################
add_qt_test(tst_qmimedatabase-xml
qt_add_test(tst_qmimedatabase-xml
SOURCES
../tst_qmimedatabase.h
tst_qmimedatabase-xml.cpp
@ -66,7 +66,7 @@ set(testdata_resource_files
"yast2-metapackage-handler-mimetypes.xml"
)
add_qt_resource(tst_qmimedatabase-xml "testdata"
qt_add_resource(tst_qmimedatabase-xml "testdata"
PREFIX
"/qt-project.org/qmime"
BASE
@ -87,7 +87,7 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-xml)
## Scopes:
#####################################################################
extend_target(tst_qmimedatabase-xml CONDITION GCC
qt_extend_target(tst_qmimedatabase-xml CONDITION GCC
COMPILE_OPTIONS
-W
-Wall
@ -97,7 +97,7 @@ extend_target(tst_qmimedatabase-xml CONDITION GCC
-Wshadow
)
extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
qt_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
DEFINES
USE_XDG_DATA_DIRS
)

2
tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qmimetype Test:
#####################################################################
add_qt_test(tst_qmimetype
qt_add_test(tst_qmimetype
SOURCES
tst_qmimetype.cpp
PUBLIC_LIBRARIES

4
tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## plugin1 Generic Library:
#####################################################################
add_cmake_library(plugin1
qt_add_cmake_library(plugin1
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@ -22,7 +22,7 @@ add_cmake_library(plugin1
## Scopes:
#####################################################################
extend_target(plugin1 CONDITION NOT QT_FEATURE_library
qt_extend_target(plugin1 CONDITION NOT QT_FEATURE_library
DEFINES
QT_STATICPLUGIN
)

4
tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## plugin2 Generic Library:
#####################################################################
add_cmake_library(plugin2
qt_add_cmake_library(plugin2
MODULE
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
@ -22,7 +22,7 @@ add_cmake_library(plugin2
## Scopes:
#####################################################################
extend_target(plugin2 CONDITION NOT QT_FEATURE_library
qt_extend_target(plugin2 CONDITION NOT QT_FEATURE_library
DEFINES
QT_STATICPLUGIN
)

6
tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qfactoryloader Test:
#####################################################################
add_qt_test(tst_qfactoryloader
qt_add_test(tst_qfactoryloader
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../plugin1/plugininterface1.h
@ -17,7 +17,7 @@ add_qt_test(tst_qfactoryloader
## Scopes:
#####################################################################
extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
PUBLIC_LIBRARIES
# Remove: L
../bin/
@ -31,7 +31,7 @@ if(ANDROID)
${CMAKE_CURRENT_BINARY_DIR}/../bin
)
add_qt_resource(tst_qfactoryloader "qmake_libs"
qt_add_resource(tst_qfactoryloader "qmake_libs"
PREFIX
"android_test_data"
BASE

6
tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_qfactoryloader Test:
#####################################################################
add_qt_test(tst_qfactoryloader
qt_add_test(tst_qfactoryloader
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../plugin1/plugininterface1.h
@ -23,7 +23,7 @@ if (NOT QT_FEATURE_library)
endif()
# special case end
extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
PUBLIC_LIBRARIES
# Remove: L
# special case begin
@ -57,7 +57,7 @@ if(ANDROID)
endif()
# special case end
add_qt_resource(tst_qfactoryloader "qmake_libs"
qt_add_resource(tst_qfactoryloader "qmake_libs"
PREFIX
"android_test_data"
BASE

4
tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## mylib Generic Library:
#####################################################################
add_cmake_library(mylib
qt_add_cmake_library(mylib
SHARED
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
@ -22,7 +22,7 @@ add_cmake_library(mylib
## Scopes:
#####################################################################
extend_target(mylib CONDITION MSVC
qt_extend_target(mylib CONDITION MSVC
DEFINES
WIN32_MSVC
)

4
tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## mylib Generic Library:
#####################################################################
add_cmake_library(mylib
qt_add_cmake_library(mylib
SHARED
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
@ -37,7 +37,7 @@ endif()
## Scopes:
#####################################################################
extend_target(mylib CONDITION MSVC
qt_extend_target(mylib CONDITION MSVC
DEFINES
WIN32_MSVC
)

4
tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "../library_path/invalid.so")
add_qt_test(tst_qlibrary
qt_add_test(tst_qlibrary
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qlibrary.cpp
@ -26,7 +26,7 @@ if(ANDROID)
${CMAKE_CURRENT_BINARY_DIR}/../system.qt.test.mylib.so
)
add_qt_resource(tst_qlibrary "qmake_libs"
qt_add_resource(tst_qlibrary "qmake_libs"
PREFIX
"android_test_data"
BASE

4
tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "../library_path/invalid.so")
add_qt_test(tst_qlibrary
qt_add_test(tst_qlibrary
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qlibrary.cpp
@ -39,7 +39,7 @@ if(ANDROID)
# special case end
)
add_qt_resource(tst_qlibrary "qmake_libs"
qt_add_resource(tst_qlibrary "qmake_libs"
PREFIX
"android_test_data"
BASE

Some files were not shown because too many files have changed in this diff Show More