From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 10:16:58 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- .../animation/qabstractanimation/CMakeLists.txt | 2 +- .../animation/qanimationgroup/CMakeLists.txt | 2 +- .../qparallelanimationgroup/CMakeLists.txt | 2 +- .../animation/qpauseanimation/CMakeLists.txt | 2 +- .../animation/qpropertyanimation/CMakeLists.txt | 2 +- .../qsequentialanimationgroup/CMakeLists.txt | 2 +- .../animation/qvariantanimation/CMakeLists.txt | 2 +- .../auto/corelib/global/q_func_info/CMakeLists.txt | 2 +- tests/auto/corelib/global/qflags/CMakeLists.txt | 2 +- tests/auto/corelib/global/qfloat16/CMakeLists.txt | 2 +- .../auto/corelib/global/qgetputenv/CMakeLists.txt | 2 +- tests/auto/corelib/global/qglobal/CMakeLists.txt | 2 +- .../corelib/global/qglobalstatic/CMakeLists.txt | 2 +- tests/auto/corelib/global/qhooks/CMakeLists.txt | 2 +- .../corelib/global/qkeycombination/CMakeLists.txt | 2 +- tests/auto/corelib/global/qlogging/CMakeLists.txt | 4 +- tests/auto/corelib/global/qnumeric/CMakeLists.txt | 6 +-- .../corelib/global/qrandomgenerator/CMakeLists.txt | 2 +- tests/auto/corelib/global/qtendian/CMakeLists.txt | 2 +- .../corelib/global/qwinregistry/CMakeLists.txt | 2 +- tests/auto/corelib/io/largefile/CMakeLists.txt | 2 +- .../corelib/io/qabstractfileengine/CMakeLists.txt | 4 +- tests/auto/corelib/io/qbuffer/CMakeLists.txt | 2 +- tests/auto/corelib/io/qdataurl/CMakeLists.txt | 2 +- tests/auto/corelib/io/qdebug/CMakeLists.txt | 2 +- tests/auto/corelib/io/qdir/CMakeLists.txt | 8 ++-- .../corelib/io/qdir/testdir/dir/CMakeLists.txt | 2 +- tests/auto/corelib/io/qdiriterator/CMakeLists.txt | 6 +-- tests/auto/corelib/io/qfile/.prev_CMakeLists.txt | 16 ++++---- tests/auto/corelib/io/qfile/CMakeLists.txt | 16 ++++---- .../corelib/io/qfile/stdinprocess/CMakeLists.txt | 2 +- tests/auto/corelib/io/qfileinfo/CMakeLists.txt | 8 ++-- tests/auto/corelib/io/qfileselector/CMakeLists.txt | 4 +- .../corelib/io/qfilesystementry/CMakeLists.txt | 2 +- .../corelib/io/qfilesystemmetadata/CMakeLists.txt | 2 +- .../corelib/io/qfilesystemwatcher/CMakeLists.txt | 2 +- tests/auto/corelib/io/qiodevice/CMakeLists.txt | 4 +- tests/auto/corelib/io/qipaddress/CMakeLists.txt | 2 +- tests/auto/corelib/io/qlockfile/CMakeLists.txt | 4 +- .../qlockfiletesthelper/.prev_CMakeLists.txt | 2 +- .../qlockfile/qlockfiletesthelper/CMakeLists.txt | 2 +- .../corelib/io/qloggingcategory/CMakeLists.txt | 2 +- .../corelib/io/qloggingregistry/CMakeLists.txt | 4 +- tests/auto/corelib/io/qnodebug/CMakeLists.txt | 2 +- .../io/qprocess-noapplication/CMakeLists.txt | 2 +- .../io/qprocess/fileWriterProcess/CMakeLists.txt | 2 +- tests/auto/corelib/io/qprocess/test/CMakeLists.txt | 2 +- .../io/qprocess/testDetached/CMakeLists.txt | 2 +- .../io/qprocess/testExitCodes/.prev_CMakeLists.txt | 2 +- .../io/qprocess/testExitCodes/CMakeLists.txt | 2 +- .../io/qprocess/testForwarding/CMakeLists.txt | 2 +- .../testForwardingHelper/.prev_CMakeLists.txt | 2 +- .../qprocess/testForwardingHelper/CMakeLists.txt | 2 +- .../io/qprocess/testGuiProcess/CMakeLists.txt | 2 +- .../qprocess/testProcessCrash/.prev_CMakeLists.txt | 2 +- .../io/qprocess/testProcessCrash/CMakeLists.txt | 2 +- .../.prev_CMakeLists.txt | 2 +- .../testProcessDeadWhileReading/CMakeLists.txt | 2 +- .../qprocess/testProcessEOF/.prev_CMakeLists.txt | 2 +- .../io/qprocess/testProcessEOF/CMakeLists.txt | 2 +- .../qprocess/testProcessEcho/.prev_CMakeLists.txt | 2 +- .../io/qprocess/testProcessEcho/CMakeLists.txt | 2 +- .../qprocess/testProcessEcho2/.prev_CMakeLists.txt | 2 +- .../io/qprocess/testProcessEcho2/CMakeLists.txt | 2 +- .../qprocess/testProcessEcho3/.prev_CMakeLists.txt | 2 +- .../io/qprocess/testProcessEcho3/CMakeLists.txt | 2 +- .../testProcessEchoGui/.prev_CMakeLists.txt | 4 +- .../io/qprocess/testProcessEchoGui/CMakeLists.txt | 4 +- .../testProcessEnvironment/.prev_CMakeLists.txt | 2 +- .../qprocess/testProcessEnvironment/CMakeLists.txt | 2 +- .../qprocess/testProcessHang/.prev_CMakeLists.txt | 2 +- .../io/qprocess/testProcessHang/CMakeLists.txt | 2 +- .../io/qprocess/testProcessNormal/CMakeLists.txt | 2 +- .../io/qprocess/testProcessOutput/CMakeLists.txt | 2 +- .../testProcessSpacesArgs/.prev_CMakeLists.txt | 2 +- .../qprocess/testProcessSpacesArgs/CMakeLists.txt | 6 +-- .../testSetNamedPipeHandleState/CMakeLists.txt | 2 +- .../testSetWorkingDirectory/CMakeLists.txt | 2 +- .../io/qprocess/testSoftExit/CMakeLists.txt | 6 +-- .../io/qprocess/testSpaceInName/CMakeLists.txt | 2 +- .../corelib/io/qprocessenvironment/CMakeLists.txt | 2 +- tests/auto/corelib/io/qsavefile/CMakeLists.txt | 2 +- tests/auto/corelib/io/qsettings/CMakeLists.txt | 8 ++-- .../auto/corelib/io/qstandardpaths/CMakeLists.txt | 4 +- tests/auto/corelib/io/qstorageinfo/CMakeLists.txt | 2 +- tests/auto/corelib/io/qtemporarydir/CMakeLists.txt | 2 +- .../auto/corelib/io/qtemporaryfile/CMakeLists.txt | 6 +-- tests/auto/corelib/io/qurl/CMakeLists.txt | 4 +- tests/auto/corelib/io/qurlinternal/CMakeLists.txt | 2 +- tests/auto/corelib/io/qurlquery/CMakeLists.txt | 2 +- .../itemmodels/qabstractitemmodel/CMakeLists.txt | 2 +- .../itemmodels/qabstractproxymodel/CMakeLists.txt | 2 +- .../qconcatenatetablesproxymodel/CMakeLists.txt | 2 +- .../itemmodels/qidentityproxymodel/CMakeLists.txt | 2 +- .../corelib/itemmodels/qitemmodel/CMakeLists.txt | 2 +- .../itemmodels/qitemselectionmodel/CMakeLists.txt | 2 +- .../qsortfilterproxymodel_recursive/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../itemmodels/qstringlistmodel/CMakeLists.txt | 2 +- .../itemmodels/qtransposeproxymodel/CMakeLists.txt | 2 +- .../kernel/qcoreapplication/.prev_CMakeLists.txt | 2 +- .../corelib/kernel/qcoreapplication/CMakeLists.txt | 2 +- .../corelib/kernel/qdeadlinetimer/CMakeLists.txt | 2 +- .../corelib/kernel/qelapsedtimer/CMakeLists.txt | 2 +- .../corelib/kernel/qeventdispatcher/CMakeLists.txt | 2 +- .../auto/corelib/kernel/qeventloop/CMakeLists.txt | 6 +-- tests/auto/corelib/kernel/qmath/CMakeLists.txt | 2 +- .../corelib/kernel/qmetacontainer/CMakeLists.txt | 2 +- tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt | 2 +- .../auto/corelib/kernel/qmetamethod/CMakeLists.txt | 2 +- .../auto/corelib/kernel/qmetaobject/CMakeLists.txt | 2 +- .../kernel/qmetaobjectbuilder/CMakeLists.txt | 2 +- .../corelib/kernel/qmetaproperty/CMakeLists.txt | 2 +- .../corelib/kernel/qmetatype/.prev_CMakeLists.txt | 38 ------------------- tests/auto/corelib/kernel/qmetatype/CMakeLists.txt | 6 +-- tests/auto/corelib/kernel/qmimedata/CMakeLists.txt | 2 +- .../corelib/kernel/qobject/.prev_CMakeLists.txt | 2 +- tests/auto/corelib/kernel/qobject/CMakeLists.txt | 2 +- .../kernel/qobject/signalbug/CMakeLists.txt | 2 +- tests/auto/corelib/kernel/qpointer/CMakeLists.txt | 4 +- tests/auto/corelib/kernel/qproperty/CMakeLists.txt | 2 +- .../kernel/qsharedmemory/.prev_CMakeLists.txt | 4 +- .../corelib/kernel/qsharedmemory/CMakeLists.txt | 4 +- .../qsharedmemory/producerconsumer/CMakeLists.txt | 2 +- .../corelib/kernel/qsignalblocker/CMakeLists.txt | 2 +- .../corelib/kernel/qsignalmapper/CMakeLists.txt | 2 +- .../corelib/kernel/qsocketnotifier/CMakeLists.txt | 4 +- .../corelib/kernel/qsystemsemaphore/CMakeLists.txt | 2 +- .../qsystemsemaphore/acquirerelease/CMakeLists.txt | 2 +- tests/auto/corelib/kernel/qtimer/CMakeLists.txt | 2 +- .../auto/corelib/kernel/qtranslator/CMakeLists.txt | 6 +-- .../corelib/kernel/qvariant/.prev_CMakeLists.txt | 44 ---------------------- tests/auto/corelib/kernel/qvariant/CMakeLists.txt | 8 ++-- .../kernel/qwineventnotifier/CMakeLists.txt | 2 +- .../qmimedatabase-cache/.prev_CMakeLists.txt | 10 ++--- .../qmimedatabase-cache/CMakeLists.txt | 8 ++-- .../qmimedatabase-xml/.prev_CMakeLists.txt | 10 ++--- .../qmimedatabase/qmimedatabase-xml/CMakeLists.txt | 8 ++-- .../corelib/mimetypes/qmimetype/CMakeLists.txt | 2 +- .../plugin/qfactoryloader/plugin1/CMakeLists.txt | 4 +- .../plugin/qfactoryloader/plugin2/CMakeLists.txt | 4 +- .../qfactoryloader/test/.prev_CMakeLists.txt | 6 +-- .../plugin/qfactoryloader/test/CMakeLists.txt | 6 +-- .../plugin/qlibrary/lib/.prev_CMakeLists.txt | 4 +- .../corelib/plugin/qlibrary/lib/CMakeLists.txt | 4 +- .../corelib/plugin/qlibrary/lib2/CMakeLists.txt | 4 +- .../plugin/qlibrary/tst/.prev_CMakeLists.txt | 4 +- .../corelib/plugin/qlibrary/tst/CMakeLists.txt | 4 +- tests/auto/corelib/plugin/qplugin/CMakeLists.txt | 2 +- .../plugin/qplugin/debugplugin/CMakeLists.txt | 2 +- .../plugin/qplugin/invalidplugin/CMakeLists.txt | 2 +- .../plugin/qplugin/releaseplugin/CMakeLists.txt | 2 +- .../almostplugin/.prev_CMakeLists.txt | 4 +- .../qpluginloader/almostplugin/CMakeLists.txt | 4 +- .../plugin/qpluginloader/lib/.prev_CMakeLists.txt | 4 +- .../plugin/qpluginloader/lib/CMakeLists.txt | 4 +- .../staticplugin/.prev_CMakeLists.txt | 4 +- .../qpluginloader/staticplugin/CMakeLists.txt | 2 +- .../plugin/qpluginloader/theplugin/CMakeLists.txt | 2 +- .../plugin/qpluginloader/tst/.prev_CMakeLists.txt | 43 --------------------- .../plugin/qpluginloader/tst/CMakeLists.txt | 10 ++--- .../corelib/plugin/quuid/test/.prev_CMakeLists.txt | 4 +- .../auto/corelib/plugin/quuid/test/CMakeLists.txt | 4 +- .../testProcessUniqueness/.prev_CMakeLists.txt | 2 +- .../quuid/testProcessUniqueness/CMakeLists.txt | 2 +- .../auto/corelib/serialization/json/CMakeLists.txt | 6 +-- .../serialization/qcborstreamreader/CMakeLists.txt | 2 +- .../serialization/qcborstreamwriter/CMakeLists.txt | 2 +- .../serialization/qcborvalue/CMakeLists.txt | 2 +- .../serialization/qcborvalue_json/CMakeLists.txt | 2 +- .../serialization/qdatastream/.prev_CMakeLists.txt | 4 +- .../serialization/qdatastream/CMakeLists.txt | 4 +- .../qdatastream_core_pixmap/CMakeLists.txt | 2 +- .../qtextstream/readAllStdinProcess/CMakeLists.txt | 2 +- .../readLineStdinProcess/CMakeLists.txt | 2 +- .../qtextstream/stdinProcess/CMakeLists.txt | 2 +- .../serialization/qtextstream/test/CMakeLists.txt | 6 +-- .../serialization/qxmlstream/CMakeLists.txt | 2 +- tests/auto/corelib/text/qbytearray/CMakeLists.txt | 6 +-- .../text/qbytearrayapisymmetry/CMakeLists.txt | 2 +- .../corelib/text/qbytearraylist/CMakeLists.txt | 2 +- .../corelib/text/qbytearraymatcher/CMakeLists.txt | 2 +- .../corelib/text/qbytearrayview/CMakeLists.txt | 2 +- .../corelib/text/qbytedatabuffer/CMakeLists.txt | 2 +- tests/auto/corelib/text/qchar/CMakeLists.txt | 4 +- tests/auto/corelib/text/qcollator/CMakeLists.txt | 2 +- .../auto/corelib/text/qlatin1string/CMakeLists.txt | 2 +- .../text/qlocale/syslocaleapp/CMakeLists.txt | 2 +- .../auto/corelib/text/qlocale/test/CMakeLists.txt | 6 +-- .../corelib/text/qregularexpression/CMakeLists.txt | 2 +- tests/auto/corelib/text/qstring/CMakeLists.txt | 6 +-- .../qstring_no_cast_from_bytearray/CMakeLists.txt | 2 +- .../corelib/text/qstringapisymmetry/CMakeLists.txt | 2 +- .../qstringbuilder/qstringbuilder1/CMakeLists.txt | 2 +- .../qstringbuilder/qstringbuilder2/CMakeLists.txt | 2 +- .../qstringbuilder/qstringbuilder3/CMakeLists.txt | 2 +- .../qstringbuilder/qstringbuilder4/CMakeLists.txt | 2 +- .../corelib/text/qstringconverter/CMakeLists.txt | 2 +- .../corelib/text/qstringiterator/CMakeLists.txt | 2 +- tests/auto/corelib/text/qstringlist/CMakeLists.txt | 2 +- .../corelib/text/qstringmatcher/CMakeLists.txt | 2 +- .../corelib/text/qstringtokenizer/CMakeLists.txt | 2 +- tests/auto/corelib/text/qstringview/CMakeLists.txt | 2 +- .../text/qtextboundaryfinder/CMakeLists.txt | 4 +- .../auto/corelib/thread/qatomicint/CMakeLists.txt | 2 +- .../thread/qatomicinteger/char/CMakeLists.txt | 2 +- .../thread/qatomicinteger/char16_t/CMakeLists.txt | 2 +- .../thread/qatomicinteger/char32_t/CMakeLists.txt | 2 +- .../thread/qatomicinteger/int/CMakeLists.txt | 2 +- .../thread/qatomicinteger/long/CMakeLists.txt | 2 +- .../thread/qatomicinteger/qlonglong/CMakeLists.txt | 2 +- .../thread/qatomicinteger/qptrdiff/CMakeLists.txt | 2 +- .../thread/qatomicinteger/quintptr/CMakeLists.txt | 2 +- .../qatomicinteger/qulonglong/CMakeLists.txt | 2 +- .../thread/qatomicinteger/schar/CMakeLists.txt | 2 +- .../thread/qatomicinteger/short/CMakeLists.txt | 2 +- .../thread/qatomicinteger/uchar/CMakeLists.txt | 2 +- .../thread/qatomicinteger/uint/CMakeLists.txt | 2 +- .../thread/qatomicinteger/ulong/CMakeLists.txt | 2 +- .../thread/qatomicinteger/ushort/CMakeLists.txt | 2 +- .../thread/qatomicinteger/wchar_t/CMakeLists.txt | 2 +- .../corelib/thread/qatomicpointer/CMakeLists.txt | 2 +- .../corelib/thread/qfuture/.prev_CMakeLists.txt | 2 +- tests/auto/corelib/thread/qfuture/CMakeLists.txt | 2 +- .../thread/qfuturesynchronizer/CMakeLists.txt | 2 +- .../corelib/thread/qfuturewatcher/CMakeLists.txt | 2 +- tests/auto/corelib/thread/qmutex/CMakeLists.txt | 4 +- .../corelib/thread/qmutexlocker/CMakeLists.txt | 2 +- .../corelib/thread/qpromise/.prev_CMakeLists.txt | 12 ------ tests/auto/corelib/thread/qpromise/CMakeLists.txt | 2 +- .../auto/corelib/thread/qreadlocker/CMakeLists.txt | 2 +- .../corelib/thread/qreadwritelock/CMakeLists.txt | 2 +- .../corelib/thread/qresultstore/CMakeLists.txt | 2 +- .../auto/corelib/thread/qsemaphore/CMakeLists.txt | 2 +- .../corelib/thread/qthread/.prev_CMakeLists.txt | 16 -------- tests/auto/corelib/thread/qthread/CMakeLists.txt | 2 +- .../auto/corelib/thread/qthreadonce/CMakeLists.txt | 2 +- .../auto/corelib/thread/qthreadpool/CMakeLists.txt | 2 +- .../corelib/thread/qthreadstorage/CMakeLists.txt | 2 +- .../crashonexit/.prev_CMakeLists.txt | 2 +- .../qthreadstorage/crashonexit/CMakeLists.txt | 2 +- .../corelib/thread/qwaitcondition/CMakeLists.txt | 2 +- .../corelib/thread/qwritelocker/CMakeLists.txt | 2 +- tests/auto/corelib/time/qcalendar/CMakeLists.txt | 2 +- tests/auto/corelib/time/qdate/CMakeLists.txt | 2 +- tests/auto/corelib/time/qdatetime/CMakeLists.txt | 4 +- tests/auto/corelib/time/qtime/CMakeLists.txt | 2 +- tests/auto/corelib/time/qtimezone/CMakeLists.txt | 6 +-- .../corelib/tools/collections/.prev_CMakeLists.txt | 2 +- .../auto/corelib/tools/collections/CMakeLists.txt | 2 +- .../tools/containerapisymmetry/CMakeLists.txt | 2 +- .../auto/corelib/tools/qalgorithms/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qarraydata/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qbitarray/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qcache/CMakeLists.txt | 2 +- .../tools/qcommandlineparser/CMakeLists.txt | 2 +- .../qcommandlineparser/testhelper/CMakeLists.txt | 2 +- .../corelib/tools/qcontiguouscache/CMakeLists.txt | 2 +- .../tools/qcryptographichash/CMakeLists.txt | 4 +- .../auto/corelib/tools/qeasingcurve/CMakeLists.txt | 2 +- .../qexplicitlyshareddatapointer/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qflatmap/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qfreelist/CMakeLists.txt | 4 +- .../auto/corelib/tools/qhash/.prev_CMakeLists.txt | 2 +- tests/auto/corelib/tools/qhash/CMakeLists.txt | 2 +- .../corelib/tools/qhashfunctions/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qline/CMakeLists.txt | 4 +- tests/auto/corelib/tools/qlist/CMakeLists.txt | 2 +- .../tools/qmacautoreleasepool/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qmakearray/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt | 2 +- tests/auto/corelib/tools/qmap/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qmargins/CMakeLists.txt | 2 +- .../qmessageauthenticationcode/CMakeLists.txt | 2 +- .../tools/qoffsetstringarray/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qpair/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qpoint/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qpointf/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qqueue/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qrect/CMakeLists.txt | 2 +- .../auto/corelib/tools/qringbuffer/CMakeLists.txt | 2 +- .../corelib/tools/qscopedpointer/CMakeLists.txt | 2 +- .../tools/qscopedvaluerollback/CMakeLists.txt | 2 +- .../auto/corelib/tools/qscopeguard/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qset/.prev_CMakeLists.txt | 2 +- tests/auto/corelib/tools/qset/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qsize/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qsizef/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qstl/CMakeLists.txt | 2 +- .../corelib/tools/qtaggedpointer/CMakeLists.txt | 2 +- tests/auto/corelib/tools/qtimeline/CMakeLists.txt | 2 +- .../corelib/tools/qvarlengtharray/CMakeLists.txt | 2 +- .../corelib/tools/qversionnumber/CMakeLists.txt | 2 +- 293 files changed, 402 insertions(+), 553 deletions(-) delete mode 100644 tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt delete mode 100644 tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt delete mode 100644 tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt delete mode 100644 tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt delete mode 100644 tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt b/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt index 4e9759faae..7db3ef9462 100644 --- a/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt +++ b/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractanimation Test: ##################################################################### -qt_add_test(tst_qabstractanimation +qt_internal_add_test(tst_qabstractanimation SOURCES tst_qabstractanimation.cpp ) diff --git a/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt index d25e437ea5..5dcdf49836 100644 --- a/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt +++ b/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qanimationgroup Test: ##################################################################### -qt_add_test(tst_qanimationgroup +qt_internal_add_test(tst_qanimationgroup SOURCES tst_qanimationgroup.cpp ) diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt index 182bee1cbf..9a6c9f45db 100644 --- a/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt +++ b/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qparallelanimationgroup Test: ##################################################################### -qt_add_test(tst_qparallelanimationgroup +qt_internal_add_test(tst_qparallelanimationgroup SOURCES tst_qparallelanimationgroup.cpp ) diff --git a/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt b/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt index 7fd1132c33..bc846d33e7 100644 --- a/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt +++ b/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpauseanimation Test: ##################################################################### -qt_add_test(tst_qpauseanimation +qt_internal_add_test(tst_qpauseanimation SOURCES tst_qpauseanimation.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt b/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt index be27578dae..5233616115 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt +++ b/tests/auto/corelib/animation/qpropertyanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpropertyanimation Test: ##################################################################### -qt_add_test(tst_qpropertyanimation +qt_internal_add_test(tst_qpropertyanimation SOURCES tst_qpropertyanimation.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt index 5418f1e198..e56f9f6ff8 100644 --- a/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsequentialanimationgroup Test: ##################################################################### -qt_add_test(tst_qsequentialanimationgroup +qt_internal_add_test(tst_qsequentialanimationgroup SOURCES tst_qsequentialanimationgroup.cpp ) diff --git a/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt b/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt index caebb13342..aa85e1fb5c 100644 --- a/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt +++ b/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvariantanimation Test: ##################################################################### -qt_add_test(tst_qvariantanimation +qt_internal_add_test(tst_qvariantanimation SOURCES tst_qvariantanimation.cpp ) diff --git a/tests/auto/corelib/global/q_func_info/CMakeLists.txt b/tests/auto/corelib/global/q_func_info/CMakeLists.txt index 57ae4369a2..93257c31de 100644 --- a/tests/auto/corelib/global/q_func_info/CMakeLists.txt +++ b/tests/auto/corelib/global/q_func_info/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_q_func_info Test: ##################################################################### -qt_add_test(tst_q_func_info +qt_internal_add_test(tst_q_func_info SOURCES tst_q_func_info.cpp ) diff --git a/tests/auto/corelib/global/qflags/CMakeLists.txt b/tests/auto/corelib/global/qflags/CMakeLists.txt index 8ba1cb6d48..998834d619 100644 --- a/tests/auto/corelib/global/qflags/CMakeLists.txt +++ b/tests/auto/corelib/global/qflags/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qflags Test: ##################################################################### -qt_add_test(tst_qflags +qt_internal_add_test(tst_qflags SOURCES tst_qflags.cpp ) diff --git a/tests/auto/corelib/global/qfloat16/CMakeLists.txt b/tests/auto/corelib/global/qfloat16/CMakeLists.txt index a9c3f2dd7f..b2848846fa 100644 --- a/tests/auto/corelib/global/qfloat16/CMakeLists.txt +++ b/tests/auto/corelib/global/qfloat16/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfloat16 Test: ##################################################################### -qt_add_test(tst_qfloat16 +qt_internal_add_test(tst_qfloat16 SOURCES tst_qfloat16.cpp ) diff --git a/tests/auto/corelib/global/qgetputenv/CMakeLists.txt b/tests/auto/corelib/global/qgetputenv/CMakeLists.txt index a2cc20c378..79d45c58b0 100644 --- a/tests/auto/corelib/global/qgetputenv/CMakeLists.txt +++ b/tests/auto/corelib/global/qgetputenv/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgetputenv Test: ##################################################################### -qt_add_test(tst_qgetputenv +qt_internal_add_test(tst_qgetputenv SOURCES tst_qgetputenv.cpp ) diff --git a/tests/auto/corelib/global/qglobal/CMakeLists.txt b/tests/auto/corelib/global/qglobal/CMakeLists.txt index c292b65cf9..de9a94629a 100644 --- a/tests/auto/corelib/global/qglobal/CMakeLists.txt +++ b/tests/auto/corelib/global/qglobal/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qglobal Test: ##################################################################### -qt_add_test(tst_qglobal +qt_internal_add_test(tst_qglobal SOURCES qglobal.c tst_qglobal.cpp diff --git a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt index cadc627fa7..959b2b25b0 100644 --- a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt +++ b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qglobalstatic Test: ##################################################################### -qt_add_test(tst_qglobalstatic +qt_internal_add_test(tst_qglobalstatic EXCEPTIONS SOURCES tst_qglobalstatic.cpp diff --git a/tests/auto/corelib/global/qhooks/CMakeLists.txt b/tests/auto/corelib/global/qhooks/CMakeLists.txt index 0aaefaf96e..c8d6f1a769 100644 --- a/tests/auto/corelib/global/qhooks/CMakeLists.txt +++ b/tests/auto/corelib/global/qhooks/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhooks Test: ##################################################################### -qt_add_test(tst_qhooks +qt_internal_add_test(tst_qhooks SOURCES tst_qhooks.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/global/qkeycombination/CMakeLists.txt b/tests/auto/corelib/global/qkeycombination/CMakeLists.txt index 894e1e973f..9553a35dea 100644 --- a/tests/auto/corelib/global/qkeycombination/CMakeLists.txt +++ b/tests/auto/corelib/global/qkeycombination/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qkeycombination Test: ##################################################################### -qt_add_test(tst_qkeycombination +qt_internal_add_test(tst_qkeycombination SOURCES tst_qkeycombination.cpp ) diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt index e47f62776d..06f24a675f 100644 --- a/tests/auto/corelib/global/qlogging/CMakeLists.txt +++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from qlogging.pro. # This file is almost completely custom written # special case -qt_add_executable(qlogging_helper +qt_internal_add_executable(qlogging_helper NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES app/main.cpp @@ -16,7 +16,7 @@ endif() set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default) # special case end -qt_add_test(tst_qlogging SOURCES tst_qlogging.cpp +qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp DEFINES QT_MESSAGELOGCONTEXT QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qnumeric/CMakeLists.txt b/tests/auto/corelib/global/qnumeric/CMakeLists.txt index 7ca7b92f70..0359af03ae 100644 --- a/tests/auto/corelib/global/qnumeric/CMakeLists.txt +++ b/tests/auto/corelib/global/qnumeric/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnumeric Test: ##################################################################### -qt_add_test(tst_qnumeric +qt_internal_add_test(tst_qnumeric SOURCES tst_qnumeric.cpp PUBLIC_LIBRARIES @@ -14,13 +14,13 @@ qt_add_test(tst_qnumeric ## Scopes: ##################################################################### -qt_extend_target(tst_qnumeric CONDITION ICC +qt_internal_extend_target(tst_qnumeric CONDITION ICC COMPILE_OPTIONS -fp-model strict ) -qt_extend_target(tst_qnumeric CONDITION intel_icl +qt_internal_extend_target(tst_qnumeric CONDITION intel_icl COMPILE_OPTIONS /fp:strict ) diff --git a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt index 4e162e8fa4..54fa36b5df 100644 --- a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt +++ b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrandomgenerator Test: ##################################################################### -qt_add_test(tst_qrandomgenerator +qt_internal_add_test(tst_qrandomgenerator SOURCES tst_qrandomgenerator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/global/qtendian/CMakeLists.txt b/tests/auto/corelib/global/qtendian/CMakeLists.txt index 77c3c433cd..acd0981991 100644 --- a/tests/auto/corelib/global/qtendian/CMakeLists.txt +++ b/tests/auto/corelib/global/qtendian/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtendian Test: ##################################################################### -qt_add_test(tst_qtendian +qt_internal_add_test(tst_qtendian SOURCES tst_qtendian.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/global/qwinregistry/CMakeLists.txt b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt index fc88750c9c..95d591a125 100644 --- a/tests/auto/corelib/global/qwinregistry/CMakeLists.txt +++ b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwinregistry Test: ##################################################################### -qt_add_test(tst_qwinregistry +qt_internal_add_test(tst_qwinregistry SOURCES tst_qwinregistry.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/largefile/CMakeLists.txt b/tests/auto/corelib/io/largefile/CMakeLists.txt index 6e9a3cbae8..be4b21033f 100644 --- a/tests/auto/corelib/io/largefile/CMakeLists.txt +++ b/tests/auto/corelib/io/largefile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_largefile Test: ##################################################################### -qt_add_test(tst_largefile +qt_internal_add_test(tst_largefile 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 8267c7241c..7e3b79403d 100644 --- a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt +++ b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractfileengine Test: ##################################################################### -qt_add_test(tst_qabstractfileengine +qt_internal_add_test(tst_qabstractfileengine SOURCES tst_qabstractfileengine.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ set(qabstractfileengine_resource_files "resources/" ) -qt_add_resource(tst_qabstractfileengine "qabstractfileengine" +qt_internal_add_resource(tst_qabstractfileengine "qabstractfileengine" PREFIX "/tst_qabstractfileengine/" FILES diff --git a/tests/auto/corelib/io/qbuffer/CMakeLists.txt b/tests/auto/corelib/io/qbuffer/CMakeLists.txt index 5a374173ef..7d57d78b3f 100644 --- a/tests/auto/corelib/io/qbuffer/CMakeLists.txt +++ b/tests/auto/corelib/io/qbuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbuffer Test: ##################################################################### -qt_add_test(tst_qbuffer +qt_internal_add_test(tst_qbuffer SOURCES tst_qbuffer.cpp ) diff --git a/tests/auto/corelib/io/qdataurl/CMakeLists.txt b/tests/auto/corelib/io/qdataurl/CMakeLists.txt index 8020879311..b13a235d3b 100644 --- a/tests/auto/corelib/io/qdataurl/CMakeLists.txt +++ b/tests/auto/corelib/io/qdataurl/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdataurl Test: ##################################################################### -qt_add_test(tst_qdataurl +qt_internal_add_test(tst_qdataurl SOURCES tst_qdataurl.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qdebug/CMakeLists.txt b/tests/auto/corelib/io/qdebug/CMakeLists.txt index 6656b6089b..39b92b9d2f 100644 --- a/tests/auto/corelib/io/qdebug/CMakeLists.txt +++ b/tests/auto/corelib/io/qdebug/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdebug Test: ##################################################################### -qt_add_test(tst_qdebug +qt_internal_add_test(tst_qdebug 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 49711da087..4c26780f99 100644 --- a/tests/auto/corelib/io/qdir/CMakeLists.txt +++ b/tests/auto/corelib/io/qdir/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND test_data "entrylist") list(APPEND test_data "types") list(APPEND test_data "tst_qdir.cpp") -qt_add_test(tst_qdir +qt_internal_add_test(tst_qdir SOURCES tst_qdir.cpp PUBLIC_LIBRARIES @@ -26,7 +26,7 @@ set(qdir_resource_files "resources/entryList/" ) -qt_add_resource(tst_qdir "qdir" +qt_internal_add_resource(tst_qdir "qdir" PREFIX "/tst_qdir/" FILES @@ -40,7 +40,7 @@ qt_add_resource(tst_qdir "qdir" #### Keys ignored in scope 2:.:.:qdir.pro:IOS: # QMAKE_INFO_PLIST = "Info.plist" -qt_extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata +qt_internal_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" ) - qt_add_resource(tst_qdir "android_testdata" + qt_internal_add_resource(tst_qdir "android_testdata" PREFIX "/android_testdata" FILES diff --git a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt index 19e64e037c..92ce7b4e89 100644 --- a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt +++ b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt @@ -4,7 +4,7 @@ ## qdir Binary: ##################################################################### -qt_add_executable(qdir +qt_internal_add_executable(qdir GUI DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt index 39703e8c83..feb742396d 100644 --- a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt +++ b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "entrylist") -qt_add_test(tst_qdiriterator +qt_internal_add_test(tst_qdiriterator SOURCES tst_qdiriterator.cpp PUBLIC_LIBRARIES @@ -21,7 +21,7 @@ set(qdiriterator_resource_files "entrylist/file" ) -qt_add_resource(tst_qdiriterator "qdiriterator" +qt_internal_add_resource(tst_qdiriterator "qdiriterator" PREFIX "/testdata/" FILES @@ -32,7 +32,7 @@ qt_add_resource(tst_qdiriterator "qdiriterator" ## Scopes: ##################################################################### -qt_extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata +qt_internal_extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt index 8e72a89649..e32930f55a 100644 --- a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt") list(APPEND test_data "forRenaming.txt") list(APPEND test_data "resources/file1.ext1") -qt_add_test(tst_qfile +qt_internal_add_test(tst_qfile SOURCES ../../../../shared/emulationdetector.h tst_qfile.cpp @@ -33,7 +33,7 @@ set(qfile_resource_files "resources/" ) -qt_add_resource(tst_qfile "qfile" +qt_internal_add_resource(tst_qfile "qfile" PREFIX "/tst_qfileinfo/" FILES @@ -43,7 +43,7 @@ set(rename-fallback_resource_files "rename-fallback.qrc" ) -qt_add_resource(tst_qfile "rename-fallback" +qt_internal_add_resource(tst_qfile "rename-fallback" PREFIX "/" FILES @@ -53,7 +53,7 @@ set(copy-fallback_resource_files "copy-fallback.qrc" ) -qt_add_resource(tst_qfile "copy-fallback" +qt_internal_add_resource(tst_qfile "copy-fallback" PREFIX "/" FILES @@ -64,22 +64,22 @@ qt_add_resource(tst_qfile "copy-fallback" ## Scopes: ##################################################################### -qt_extend_target(tst_qfile CONDITION TARGET Qt::Network +qt_internal_extend_target(tst_qfile CONDITION TARGET Qt::Network PUBLIC_LIBRARIES Qt::Network ) -qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network +qt_internal_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network DEFINES QT_NO_NETWORK ) -qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata +qt_internal_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata DEFINES BUILTIN_TESTDATA ) -qt_extend_target(tst_qfile CONDITION WIN32 +qt_internal_extend_target(tst_qfile CONDITION WIN32 PUBLIC_LIBRARIES ole32 uuid diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt index 916b291f54..7a0102bfd9 100644 --- a/tests/auto/corelib/io/qfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt") list(APPEND test_data "forRenaming.txt") list(APPEND test_data "resources/file1.ext1") -qt_add_test(tst_qfile +qt_internal_add_test(tst_qfile SOURCES ../../../../shared/emulationdetector.h tst_qfile.cpp @@ -33,7 +33,7 @@ set(qfile_resource_files "resources/" ) -qt_add_resource(tst_qfile "qfile" +qt_internal_add_resource(tst_qfile "qfile" PREFIX "/tst_qfileinfo/" FILES @@ -43,7 +43,7 @@ set(rename-fallback_resource_files "rename-fallback.qrc" ) -qt_add_resource(tst_qfile "rename-fallback" +qt_internal_add_resource(tst_qfile "rename-fallback" PREFIX "/" FILES @@ -53,7 +53,7 @@ set(copy-fallback_resource_files "copy-fallback.qrc" ) -qt_add_resource(tst_qfile "copy-fallback" +qt_internal_add_resource(tst_qfile "copy-fallback" PREFIX "/" FILES @@ -64,22 +64,22 @@ qt_add_resource(tst_qfile "copy-fallback" ## Scopes: ##################################################################### -qt_extend_target(tst_qfile CONDITION TARGET Qt::Network +qt_internal_extend_target(tst_qfile CONDITION TARGET Qt::Network PUBLIC_LIBRARIES Qt::Network ) -qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network +qt_internal_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network DEFINES QT_NO_NETWORK ) -qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata +qt_internal_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata DEFINES BUILTIN_TESTDATA ) -qt_extend_target(tst_qfile CONDITION WIN32 +qt_internal_extend_target(tst_qfile CONDITION WIN32 PUBLIC_LIBRARIES ole32 uuid diff --git a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt index eb1f6a0ff0..e034e0502c 100644 --- a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt @@ -4,7 +4,7 @@ ## stdinprocess_helper Binary: ##################################################################### -qt_add_test_helper(stdinprocess_helper +qt_internal_add_test_helper(stdinprocess_helper SOURCES main.cpp ) diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt index a7ccda9c58..da955ff6a6 100644 --- a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfileinfo Test: ##################################################################### -qt_add_test(tst_qfileinfo +qt_internal_add_test(tst_qfileinfo SOURCES tst_qfileinfo.cpp PUBLIC_LIBRARIES @@ -16,7 +16,7 @@ set(qfileinfo_resource_files "resources/" ) -qt_add_resource(tst_qfileinfo "qfileinfo" +qt_internal_add_resource(tst_qfileinfo "qfileinfo" PREFIX "/tst_qfileinfo/" FILES @@ -29,7 +29,7 @@ set(testdata_resource_files "tst_qfileinfo.cpp" ) -qt_add_resource(tst_qfileinfo "testdata" +qt_internal_add_resource(tst_qfileinfo "testdata" PREFIX "/testdata" FILES @@ -40,7 +40,7 @@ qt_add_resource(tst_qfileinfo "testdata" ## Scopes: ##################################################################### -qt_extend_target(tst_qfileinfo CONDITION WIN32 +qt_internal_extend_target(tst_qfileinfo CONDITION WIN32 PUBLIC_LIBRARIES advapi32 netapi32 diff --git a/tests/auto/corelib/io/qfileselector/CMakeLists.txt b/tests/auto/corelib/io/qfileselector/CMakeLists.txt index 67840c8112..5f254044df 100644 --- a/tests/auto/corelib/io/qfileselector/CMakeLists.txt +++ b/tests/auto/corelib/io/qfileselector/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfileselectors Test: ##################################################################### -qt_add_test(tst_qfileselectors +qt_internal_add_test(tst_qfileselectors SOURCES tst_qfileselector.cpp PUBLIC_LIBRARIES @@ -62,7 +62,7 @@ set(qfileselector_resource_files "platforms/test5" ) -qt_add_resource(tst_qfileselectors "qfileselector" +qt_internal_add_resource(tst_qfileselectors "qfileselector" PREFIX "/" FILES diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt index a99884b617..574ba0efc8 100644 --- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfilesystementry Test: ##################################################################### -qt_add_test(tst_qfilesystementry +qt_internal_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 diff --git a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt index 4970e5a426..9b1705f072 100644 --- a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfilesystemmetadata Test: ##################################################################### -qt_add_test(tst_qfilesystemmetadata +qt_internal_add_test(tst_qfilesystemmetadata SOURCES tst_qfilesystemmetadata.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt index ac72470019..7523122907 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfilesystemwatcher Test: ##################################################################### -qt_add_test(tst_qfilesystemwatcher +qt_internal_add_test(tst_qfilesystemwatcher SOURCES tst_qfilesystemwatcher.cpp ) diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt index fdc896e45d..3fa19d9f30 100644 --- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt +++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "tst_qiodevice.cpp") -qt_add_test(tst_qiodevice +qt_internal_add_test(tst_qiodevice SOURCES tst_qiodevice.cpp PUBLIC_LIBRARIES @@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "tst_qiodevice.cpp" ) - qt_add_resource(tst_qiodevice "android_testdata" + qt_internal_add_resource(tst_qiodevice "android_testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/io/qipaddress/CMakeLists.txt b/tests/auto/corelib/io/qipaddress/CMakeLists.txt index da7f5a9061..b4801c2ab2 100644 --- a/tests/auto/corelib/io/qipaddress/CMakeLists.txt +++ b/tests/auto/corelib/io/qipaddress/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qipaddress Test: ##################################################################### -qt_add_test(tst_qipaddress +qt_internal_add_test(tst_qipaddress SOURCES tst_qipaddress.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qlockfile/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/CMakeLists.txt index baab320b8c..828aea049e 100644 --- a/tests/auto/corelib/io/qlockfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlockfile Test: ##################################################################### -qt_add_test(tst_qlockfile +qt_internal_add_test(tst_qlockfile SOURCES tst_qlockfile.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ qt_add_test(tst_qlockfile ## Scopes: ##################################################################### -qt_extend_target(tst_qlockfile CONDITION WIN32 +qt_internal_extend_target(tst_qlockfile CONDITION WIN32 PUBLIC_LIBRARIES advapi32 ) diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt index e0f500f8ae..6526d690f9 100644 --- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qlockfile_test_helper Binary: ##################################################################### -qt_add_executable(qlockfile_test_helper +qt_internal_add_executable(qlockfile_test_helper 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 957d60ca1b..8917f2aa34 100644 --- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## qlockfile_test_helper Binary: ##################################################################### -qt_add_test_helper(qlockfile_test_helper # special case +qt_internal_add_test_helper(qlockfile_test_helper # special case OVERRIDE_OUTPUT_DIRECTORY # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt index 778315db5b..13ee586696 100644 --- a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qloggingcategory Test: ##################################################################### -qt_add_test(tst_qloggingcategory +qt_internal_add_test(tst_qloggingcategory SOURCES tst_qloggingcategory.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt index e4d1cf4aaf..4c903de17f 100644 --- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "qtlogging.ini") -qt_add_test(tst_qloggingregistry +qt_internal_add_test(tst_qloggingregistry SOURCES tst_qloggingregistry.cpp PUBLIC_LIBRARIES @@ -27,7 +27,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "qtlogging.ini" ) - qt_add_resource(tst_qloggingregistry "android_testdata" + qt_internal_add_resource(tst_qloggingregistry "android_testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/io/qnodebug/CMakeLists.txt b/tests/auto/corelib/io/qnodebug/CMakeLists.txt index fe410643fc..5fd4a3738c 100644 --- a/tests/auto/corelib/io/qnodebug/CMakeLists.txt +++ b/tests/auto/corelib/io/qnodebug/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnodebug Test: ##################################################################### -qt_add_test(tst_qnodebug +qt_internal_add_test(tst_qnodebug 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 ae7910e302..0118d46ae8 100644 --- a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt @@ -4,7 +4,7 @@ ## qprocess-noapplication Test: ##################################################################### -qt_add_test(qprocess-noapplication +qt_internal_add_test(qprocess-noapplication SOURCES tst_qprocessnoapplication.cpp ) diff --git a/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt index 92b4c258dd..ce4519ce99 100644 --- a/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/fileWriterProcess/CMakeLists.txt @@ -4,7 +4,7 @@ ## fileWriterProcess Binary: ##################################################################### -qt_add_executable(fileWriterProcess +qt_internal_add_executable(fileWriterProcess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt index 0541b4258a..249cb089cf 100644 --- a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprocess Test: ##################################################################### -qt_add_test(tst_qprocess +qt_internal_add_test(tst_qprocess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../../../../../shared/emulationdetector.h diff --git a/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt index a7f9b9412d..368ca92f09 100644 --- a/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testDetached/CMakeLists.txt @@ -4,7 +4,7 @@ ## testDetached Binary: ##################################################################### -qt_add_executable(testDetached +qt_internal_add_executable(testDetached OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt index cf3f6f4e64..26973bfc2d 100644 --- a/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testExitCodes/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testExitCodes Binary: ##################################################################### -qt_add_executable(testExitCodes +qt_internal_add_executable(testExitCodes OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt index 5ad0ab05df..24f231982e 100644 --- a/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testExitCodes/CMakeLists.txt @@ -4,7 +4,7 @@ ## testExitCodes Binary: ##################################################################### -qt_add_executable(testExitCodes +qt_internal_add_executable(testExitCodes OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt index 83658e4b7a..914785178c 100644 --- a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt @@ -4,7 +4,7 @@ ## testForwarding Binary: ##################################################################### -qt_add_executable(testForwarding +qt_internal_add_executable(testForwarding OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt index 9197f96e10..3fd1385f71 100644 --- a/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testForwardingHelper Binary: ##################################################################### -qt_add_executable(testForwardingHelper +qt_internal_add_executable(testForwardingHelper OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt index 0024b006ed..f13f2f6b03 100644 --- a/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## testForwardingHelper Binary: ##################################################################### -qt_add_executable(testForwardingHelper +qt_internal_add_executable(testForwardingHelper OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt index bd6853c438..e36a33bfa4 100644 --- a/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testGuiProcess/CMakeLists.txt @@ -4,7 +4,7 @@ ## testGuiProcess Binary: ##################################################################### -qt_add_executable(testGuiProcess +qt_internal_add_executable(testGuiProcess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt index d09e1364fb..c40b850a56 100644 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessCrash Binary: ##################################################################### -qt_add_executable(testProcessCrash +qt_internal_add_executable(testProcessCrash OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt index 1b2ab3eac5..1afc662a2c 100644 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessCrash Binary: ##################################################################### -qt_add_executable(testProcessCrash +qt_internal_add_executable(testProcessCrash OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt index aade19fa91..9416580e04 100644 --- a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessDeadWhileReading Binary: ##################################################################### -qt_add_executable(testProcessDeadWhileReading +qt_internal_add_executable(testProcessDeadWhileReading OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt index 50407cbc7a..55dce67f8a 100644 --- a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessDeadWhileReading Binary: ##################################################################### -qt_add_executable(testProcessDeadWhileReading +qt_internal_add_executable(testProcessDeadWhileReading OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt index 7fe205c5d4..b4f2679976 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEOF/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEOF Binary: ##################################################################### -qt_add_executable(testProcessEOF +qt_internal_add_executable(testProcessEOF OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt index b30249caa9..c3cc35db60 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEOF/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEOF Binary: ##################################################################### -qt_add_executable(testProcessEOF +qt_internal_add_executable(testProcessEOF OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt index 0db956d16c..c739335d04 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho Binary: ##################################################################### -qt_add_executable(testProcessEcho +qt_internal_add_executable(testProcessEcho OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt index db46ca06cb..128f35538b 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho Binary: ##################################################################### -qt_add_executable(testProcessEcho +qt_internal_add_executable(testProcessEcho OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt index abe80a3cff..b861f2619c 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho2/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho2 Binary: ##################################################################### -qt_add_executable(testProcessEcho2 +qt_internal_add_executable(testProcessEcho2 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt index 87acd13c16..4b3fb585f4 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho2/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho2 Binary: ##################################################################### -qt_add_executable(testProcessEcho2 +qt_internal_add_executable(testProcessEcho2 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt index 8b7a8b3a51..40e992a947 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho3/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho3 Binary: ##################################################################### -qt_add_executable(testProcessEcho3 +qt_internal_add_executable(testProcessEcho3 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt index f0905360f4..0b852a90ce 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEcho3/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEcho3 Binary: ##################################################################### -qt_add_executable(testProcessEcho3 +qt_internal_add_executable(testProcessEcho3 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt index a2e3c6a0a9..2c482b2cf8 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEchoGui Binary: ##################################################################### -qt_add_executable(testProcessEchoGui +qt_internal_add_executable(testProcessEchoGui OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 @@ -15,7 +15,7 @@ qt_add_executable(testProcessEchoGui ## Scopes: ##################################################################### -qt_extend_target(testProcessEchoGui CONDITION WIN32 +qt_internal_extend_target(testProcessEchoGui CONDITION WIN32 SOURCES main_win.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt index ca529c0c84..f96c8a4fa5 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEchoGui Binary: ##################################################################### -qt_add_executable(testProcessEchoGui +qt_internal_add_executable(testProcessEchoGui GUI # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" DEFINES @@ -16,7 +16,7 @@ qt_add_executable(testProcessEchoGui ## Scopes: ##################################################################### -qt_extend_target(testProcessEchoGui CONDITION WIN32 +qt_internal_extend_target(testProcessEchoGui CONDITION WIN32 SOURCES main_win.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt index 63d7767b60..6a0546b1aa 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEnvironment/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEnvironment Binary: ##################################################################### -qt_add_executable(testProcessEnvironment +qt_internal_add_executable(testProcessEnvironment OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt index 89c41b6446..fe48627b7c 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessEnvironment/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessEnvironment Binary: ##################################################################### -qt_add_executable(testProcessEnvironment +qt_internal_add_executable(testProcessEnvironment OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt index 77e39937b0..63989dd8e0 100644 --- a/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessHang/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessHang Binary: ##################################################################### -qt_add_executable(testProcessHang +qt_internal_add_executable(testProcessHang OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt index c3f4857225..3e8443c2a5 100644 --- a/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessHang/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessHang Binary: ##################################################################### -qt_add_executable(testProcessHang +qt_internal_add_executable(testProcessHang OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt index 2348a4b002..1726e1861b 100644 --- a/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessNormal/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessNormal Binary: ##################################################################### -qt_add_executable(testProcessNormal +qt_internal_add_executable(testProcessNormal OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt index 4e0b835aa1..2a6d016f48 100644 --- a/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessOutput/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessOutput Binary: ##################################################################### -qt_add_executable(testProcessOutput +qt_internal_add_executable(testProcessOutput OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt index f8a21c990d..5d5a049012 100644 --- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## nospace Binary: ##################################################################### -qt_add_executable(nospace +qt_internal_add_executable(nospace OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt index 3c0033a01f..fd2b38ef2f 100644 --- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/CMakeLists.txt @@ -4,7 +4,7 @@ ## nospace Binary: ##################################################################### -qt_add_executable(nospace +qt_internal_add_executable(nospace OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp @@ -15,7 +15,7 @@ qt_add_executable(nospace ) # special case begin -qt_add_executable(onespace +qt_internal_add_executable(onespace OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp @@ -26,7 +26,7 @@ qt_add_executable(onespace ) set_target_properties(onespace PROPERTIES OUTPUT_NAME "one space") -qt_add_executable(twospaces +qt_internal_add_executable(twospaces OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt index 9fc7528b2e..6b55c40f94 100644 --- a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/CMakeLists.txt @@ -4,7 +4,7 @@ ## testSetNamedPipeHandleState Binary: ##################################################################### -qt_add_executable(testSetNamedPipeHandleState +qt_internal_add_executable(testSetNamedPipeHandleState OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt index 54a8b1b4d1..97410c1b49 100644 --- a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/CMakeLists.txt @@ -4,7 +4,7 @@ ## testSetWorkingDirectory Binary: ##################################################################### -qt_add_executable(testSetWorkingDirectory +qt_internal_add_executable(testSetWorkingDirectory OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt index ec2d9433b2..ab78f9acdb 100644 --- a/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSoftExit/CMakeLists.txt @@ -4,21 +4,21 @@ ## testSoftExit Binary: ##################################################################### -qt_add_executable(testSoftExit +qt_internal_add_executable(testSoftExit OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" ) ## Scopes: ##################################################################### -qt_extend_target(testSoftExit CONDITION WIN32 +qt_internal_extend_target(testSoftExit CONDITION WIN32 SOURCES main_win.cpp PUBLIC_LIBRARIES user32 ) -qt_extend_target(testSoftExit CONDITION UNIX +qt_internal_extend_target(testSoftExit CONDITION UNIX SOURCES main_unix.cpp ) diff --git a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt index 1ca31c59df..e59ad51d6e 100644 --- a/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testSpaceInName/CMakeLists.txt @@ -4,7 +4,7 @@ ## testSpaceInName Binary: ##################################################################### -qt_add_executable(testSpaceInName +qt_internal_add_executable(testSpaceInName OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../test Space In Name" SOURCES main.cpp diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt index ba935455af..d612a32374 100644 --- a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qprocessenvironment Test: ##################################################################### -qt_add_test(tst_qprocessenvironment +qt_internal_add_test(tst_qprocessenvironment SOURCES tst_qprocessenvironment.cpp ) diff --git a/tests/auto/corelib/io/qsavefile/CMakeLists.txt b/tests/auto/corelib/io/qsavefile/CMakeLists.txt index f2c8cf0a56..0b41340279 100644 --- a/tests/auto/corelib/io/qsavefile/CMakeLists.txt +++ b/tests/auto/corelib/io/qsavefile/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "tst_qsavefile.cpp") -qt_add_test(tst_qsavefile +qt_internal_add_test(tst_qsavefile 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 3cc9547d3c..c12f94cf36 100644 --- a/tests/auto/corelib/io/qsettings/CMakeLists.txt +++ b/tests/auto/corelib/io/qsettings/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsettings Test: ##################################################################### -qt_add_test(tst_qsettings +qt_internal_add_test(tst_qsettings SOURCES tst_qsettings.cpp DEFINES @@ -28,7 +28,7 @@ set(qsettings_resource_files "withcomments.ini" ) -qt_add_resource(tst_qsettings "qsettings" +qt_internal_add_resource(tst_qsettings "qsettings" PREFIX "/" FILES @@ -39,12 +39,12 @@ qt_add_resource(tst_qsettings "qsettings" ## Scopes: ##################################################################### -qt_extend_target(tst_qsettings CONDITION MSVC +qt_internal_extend_target(tst_qsettings CONDITION MSVC PUBLIC_LIBRARIES advapi32 ) -qt_extend_target(tst_qsettings CONDITION APPLE +qt_internal_extend_target(tst_qsettings CONDITION APPLE PUBLIC_LIBRARIES ${FWCoreFoundation} ) diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt index 74ec2cd855..0a6f45c8fd 100644 --- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt +++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "tst_qstandardpaths.cpp") list(APPEND test_data "qstandardpaths.pro") -qt_add_test(tst_qstandardpaths +qt_internal_add_test(tst_qstandardpaths SOURCES tst_qstandardpaths.cpp TESTDATA ${test_data} @@ -17,7 +17,7 @@ qt_add_test(tst_qstandardpaths ## Scopes: ##################################################################### -qt_extend_target(tst_qstandardpaths CONDITION boot2qt +qt_internal_extend_target(tst_qstandardpaths CONDITION boot2qt DEFINES SKIP_FINDEXECUTABLE ) diff --git a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt index e2a47a2832..be3a8c3afe 100644 --- a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstorageinfo Test: ##################################################################### -qt_add_test(tst_qstorageinfo +qt_internal_add_test(tst_qstorageinfo SOURCES tst_qstorageinfo.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt index f1c3db54d0..58eb49dff8 100644 --- a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt +++ b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtemporarydir Test: ##################################################################### -qt_add_test(tst_qtemporarydir +qt_internal_add_test(tst_qtemporarydir 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 9b35f72a69..11d4b991ce 100644 --- a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "tst_qtemporaryfile.cpp") -qt_add_test(tst_qtemporaryfile +qt_internal_add_test(tst_qtemporaryfile SOURCES tst_qtemporaryfile.cpp PUBLIC_LIBRARIES @@ -20,7 +20,7 @@ set(qtemporaryfile_resource_files "resources/test.txt" ) -qt_add_resource(tst_qtemporaryfile "qtemporaryfile" +qt_internal_add_resource(tst_qtemporaryfile "qtemporaryfile" PREFIX "/" FILES @@ -38,7 +38,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "tst_qtemporaryfile.cpp" ) - qt_add_resource(tst_qtemporaryfile "android_testdata" + qt_internal_add_resource(tst_qtemporaryfile "android_testdata" PREFIX "/android_testdata" FILES diff --git a/tests/auto/corelib/io/qurl/CMakeLists.txt b/tests/auto/corelib/io/qurl/CMakeLists.txt index 2ea06f62d7..ce386c142c 100644 --- a/tests/auto/corelib/io/qurl/CMakeLists.txt +++ b/tests/auto/corelib/io/qurl/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qurl Test: ##################################################################### -qt_add_test(tst_qurl +qt_internal_add_test(tst_qurl SOURCES tst_qurl.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qurl ## Scopes: ##################################################################### -qt_extend_target(tst_qurl CONDITION APPLE +qt_internal_extend_target(tst_qurl CONDITION APPLE SOURCES tst_qurl_mac.mm ) diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt index 80f8e0d128..492ac0a4d6 100644 --- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt +++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qurlinternal Test: ##################################################################### -qt_add_test(tst_qurlinternal +qt_internal_add_test(tst_qurlinternal SOURCES tst_qurlinternal.cpp utf8data.cpp diff --git a/tests/auto/corelib/io/qurlquery/CMakeLists.txt b/tests/auto/corelib/io/qurlquery/CMakeLists.txt index b85e688b45..1d68c01325 100644 --- a/tests/auto/corelib/io/qurlquery/CMakeLists.txt +++ b/tests/auto/corelib/io/qurlquery/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qurlquery Test: ##################################################################### -qt_add_test(tst_qurlquery +qt_internal_add_test(tst_qurlquery SOURCES tst_qurlquery.cpp DEFINES diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt index 33d790ddc5..2f91f7d41a 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractitemmodel Test: ##################################################################### -qt_add_test(tst_qabstractitemmodel +qt_internal_add_test(tst_qabstractitemmodel SOURCES ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h tst_qabstractitemmodel.cpp diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt index f3915f98bb..277556b915 100644 --- a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractproxymodel Test: ##################################################################### -qt_add_test(tst_qabstractproxymodel +qt_internal_add_test(tst_qabstractproxymodel SOURCES tst_qabstractproxymodel.cpp DEFINES diff --git a/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt index d20abd3655..40dd512489 100644 --- a/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qconcatenatetablesproxymodel Test: ##################################################################### -qt_add_test(tst_qconcatenatetablesproxymodel +qt_internal_add_test(tst_qconcatenatetablesproxymodel SOURCES tst_qconcatenatetablesproxymodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt index cd8b2843b5..fb2ae55215 100644 --- a/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qidentityproxymodel Test: ##################################################################### -qt_add_test(tst_qidentityproxymodel +qt_internal_add_test(tst_qidentityproxymodel SOURCES ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h tst_qidentityproxymodel.cpp diff --git a/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt index c3174fe77d..7dda1a3964 100644 --- a/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qitemmodel Test: ##################################################################### -qt_add_test(tst_qitemmodel +qt_internal_add_test(tst_qitemmodel SOURCES tst_qitemmodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt index 308a526307..2dfa6f98f8 100644 --- a/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qitemselectionmodel Test: ##################################################################### -qt_add_test(tst_qitemselectionmodel +qt_internal_add_test(tst_qitemselectionmodel SOURCES tst_qitemselectionmodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt index 1849ffff4f..815b68e582 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsortfilterproxymodel_recursive Test: ##################################################################### -qt_add_test(tst_qsortfilterproxymodel_recursive +qt_internal_add_test(tst_qsortfilterproxymodel_recursive SOURCES tst_qsortfilterproxymodel_recursive.cpp DEFINES diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt index 47cb6aab34..7c4f60dab4 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsortfilterproxymodel_regularexpression Test: ##################################################################### -qt_add_test(tst_qsortfilterproxymodel_regularexpression +qt_internal_add_test(tst_qsortfilterproxymodel_regularexpression SOURCES ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h diff --git a/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt index 18d34f8951..c6123bb1e3 100644 --- a/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringlistmodel Test: ##################################################################### -qt_add_test(tst_qstringlistmodel +qt_internal_add_test(tst_qstringlistmodel SOURCES qmodellistener.h tst_qstringlistmodel.cpp diff --git a/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt index 57c8309d05..7cc675d7fd 100644 --- a/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtransposeproxymodel Test: ##################################################################### -qt_add_test(tst_qtransposeproxymodel +qt_internal_add_test(tst_qtransposeproxymodel SOURCES tst_qtransposeproxymodel.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt index 08d1338d02..9d5d5bfc1c 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qcoreapplication Test: ##################################################################### -qt_add_test(tst_qcoreapplication +qt_internal_add_test(tst_qcoreapplication SOURCES tst_qcoreapplication.cpp tst_qcoreapplication.h PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt b/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt index e552860688..24be474f90 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt @@ -16,7 +16,7 @@ else() endif() # special case end -qt_add_test(tst_qcoreapplication +qt_internal_add_test(tst_qcoreapplication VERSION ${target_version} # special case SOURCES tst_qcoreapplication.cpp tst_qcoreapplication.h diff --git a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt index 933f8e937e..8c8721abf5 100644 --- a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdeadlinetimer Test: ##################################################################### -qt_add_test(tst_qdeadlinetimer +qt_internal_add_test(tst_qdeadlinetimer SOURCES tst_qdeadlinetimer.cpp ) diff --git a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt index e88fb72bec..1592303ae3 100644 --- a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qelapsedtimer Test: ##################################################################### -qt_add_test(tst_qelapsedtimer +qt_internal_add_test(tst_qelapsedtimer SOURCES tst_qelapsedtimer.cpp ) diff --git a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt index 1893dedc30..409764a2c7 100644 --- a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qeventdispatcher Test: ##################################################################### -qt_add_test(tst_qeventdispatcher +qt_internal_add_test(tst_qeventdispatcher SOURCES tst_qeventdispatcher.cpp ) diff --git a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt index b09f6715e1..d3b817598e 100644 --- a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qeventloop Test: ##################################################################### -qt_add_test(tst_qeventloop +qt_internal_add_test(tst_qeventloop SOURCES tst_qeventloop.cpp PUBLIC_LIBRARIES @@ -15,12 +15,12 @@ qt_add_test(tst_qeventloop ## Scopes: ##################################################################### -qt_extend_target(tst_qeventloop CONDITION WIN32 +qt_internal_extend_target(tst_qeventloop CONDITION WIN32 PUBLIC_LIBRARIES user32 ) -qt_extend_target(tst_qeventloop CONDITION QT_FEATURE_glib +qt_internal_extend_target(tst_qeventloop CONDITION QT_FEATURE_glib DEFINES HAVE_GLIB ) diff --git a/tests/auto/corelib/kernel/qmath/CMakeLists.txt b/tests/auto/corelib/kernel/qmath/CMakeLists.txt index 4174144141..7a6d4bd688 100644 --- a/tests/auto/corelib/kernel/qmath/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmath/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmath Test: ##################################################################### -qt_add_test(tst_qmath +qt_internal_add_test(tst_qmath SOURCES tst_qmath.cpp ) diff --git a/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt b/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt index 6f0192155d..1e2ca88484 100644 --- a/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetacontainer/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "./typeFlags.bin") -qt_add_test(tst_qmetacontainer +qt_internal_add_test(tst_qmetacontainer SOURCES tst_qmetacontainer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt index eba96be7db..daee210588 100644 --- a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetaenum Test: ##################################################################### -qt_add_test(tst_qmetaenum +qt_internal_add_test(tst_qmetaenum SOURCES tst_qmetaenum.cpp ) diff --git a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt index 5062dc7a3f..6ab3f143ac 100644 --- a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetamethod Test: ##################################################################### -qt_add_test(tst_qmetamethod +qt_internal_add_test(tst_qmetamethod SOURCES tst_qmetamethod.cpp ) diff --git a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt index 0a9a839505..d0736f418d 100644 --- a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetaobject Test: ##################################################################### -qt_add_test(tst_qmetaobject +qt_internal_add_test(tst_qmetaobject SOURCES tst_qmetaobject.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt index bae83c137f..2171b18b2f 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetaobjectbuilder Test: ##################################################################### -qt_add_test(tst_qmetaobjectbuilder +qt_internal_add_test(tst_qmetaobjectbuilder SOURCES tst_qmetaobjectbuilder.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt index 0c9c0a810c..b69be31b1e 100644 --- a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmetaproperty Test: ##################################################################### -qt_add_test(tst_qmetaproperty +qt_internal_add_test(tst_qmetaproperty SOURCES tst_qmetaproperty.cpp ) diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt deleted file mode 100644 index 16188d2d33..0000000000 --- a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -# Generated from qmetatype.pro. - -##################################################################### -## tst_qmetatype Test: -##################################################################### - -# Collect test data -list(APPEND test_data "./typeFlags.bin") - -qt_add_test(tst_qmetatype - SOURCES - tst_qmetatype.cpp - DEFINES - QT_DISABLE_DEPRECATED_BEFORE=0 - INCLUDE_DIRECTORIES - ../../../other/qvariant_common - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - TESTDATA ${test_data} -) - -## Scopes: -##################################################################### - -qt_extend_target(tst_qmetatype CONDITION MSVC - COMPILE_OPTIONS - /bigobj -) - -#### Keys ignored in scope 3:.:.:qmetatype.pro:CLANG: -# QMAKE_CFLAGS_RELEASE = "--O2" "--g" -# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g" - -qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm") - DEFINES - TST_QMETATYPE_BROKEN_COMPILER -) diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt index 16188d2d33..d3e576127f 100644 --- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "./typeFlags.bin") -qt_add_test(tst_qmetatype +qt_internal_add_test(tst_qmetatype SOURCES tst_qmetatype.cpp DEFINES @@ -23,7 +23,7 @@ qt_add_test(tst_qmetatype ## Scopes: ##################################################################### -qt_extend_target(tst_qmetatype CONDITION MSVC +qt_internal_extend_target(tst_qmetatype CONDITION MSVC COMPILE_OPTIONS /bigobj ) @@ -32,7 +32,7 @@ qt_extend_target(tst_qmetatype CONDITION MSVC # QMAKE_CFLAGS_RELEASE = "--O2" "--g" # QMAKE_CXXFLAGS_RELEASE = "--O2" "--g" -qt_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm") +qt_internal_extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm") DEFINES TST_QMETATYPE_BROKEN_COMPILER ) diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt index 4400dfd46e..ec5505d3e0 100644 --- a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmimedata Test: ##################################################################### -qt_add_test(tst_qmimedata +qt_internal_add_test(tst_qmimedata SOURCES tst_qmimedata.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt index ea894ff3d3..67ec3b7631 100644 --- a/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qobject Test: ##################################################################### -qt_add_test(tst_qobject +qt_internal_add_test(tst_qobject SOURCES tst_qobject.cpp DEFINES diff --git a/tests/auto/corelib/kernel/qobject/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/CMakeLists.txt index 47179410b0..7ff42f7212 100644 --- a/tests/auto/corelib/kernel/qobject/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qobject Test: ##################################################################### -qt_add_test(tst_qobject +qt_internal_add_test(tst_qobject SOURCES tst_qobject.cpp DEFINES diff --git a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt index 9dadd94f04..b479ada78e 100644 --- a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt @@ -4,7 +4,7 @@ ## signalbug_helper Binary: ##################################################################### -qt_add_test_helper(signalbug_helper +qt_internal_add_test_helper(signalbug_helper SOURCES signalbug.cpp signalbug.h ) diff --git a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt index a24f25b087..cfafc1eb11 100644 --- a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpointer Test: ##################################################################### -qt_add_test(tst_qpointer +qt_internal_add_test(tst_qpointer SOURCES tst_qpointer.cpp ) @@ -12,7 +12,7 @@ qt_add_test(tst_qpointer ## Scopes: ##################################################################### -qt_extend_target(tst_qpointer CONDITION TARGET Qt::Widgets +qt_internal_extend_target(tst_qpointer CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/corelib/kernel/qproperty/CMakeLists.txt b/tests/auto/corelib/kernel/qproperty/CMakeLists.txt index 5521111ef8..55a5d71752 100644 --- a/tests/auto/corelib/kernel/qproperty/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qproperty/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qproperty Test: ##################################################################### -qt_add_test(tst_qproperty +qt_internal_add_test(tst_qproperty SOURCES tst_qproperty.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt index 90a9c9e17c..0f654b0691 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsharedmemory Test: ##################################################################### - qt_add_test(tst_qsharedmemory + qt_internal_add_test(tst_qsharedmemory SOURCES tst_qsharedmemory.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ ## Scopes: ##################################################################### - qt_extend_target(tst_qsharedmemory CONDITION LINUX + qt_internal_extend_target(tst_qsharedmemory CONDITION LINUX PUBLIC_LIBRARIES rt ) diff --git a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt index 8fb89d9af9..f853f00440 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt @@ -5,7 +5,7 @@ if(QT_FEATURE_sharedmemory) # special case ## tst_qsharedmemory Test: ##################################################################### - qt_add_test(tst_qsharedmemory + qt_internal_add_test(tst_qsharedmemory SOURCES tst_qsharedmemory.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ if(QT_FEATURE_sharedmemory) # special case ## Scopes: ##################################################################### - qt_extend_target(tst_qsharedmemory CONDITION LINUX + qt_internal_extend_target(tst_qsharedmemory CONDITION LINUX PUBLIC_LIBRARIES rt ) diff --git a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt index 31d7f0386e..610e2d507f 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt @@ -4,7 +4,7 @@ ## producerconsumer_helper Binary: ##################################################################### -qt_add_test_helper(producerconsumer_helper +qt_internal_add_test_helper(producerconsumer_helper SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt index a7a6306bfc..ff5a20bcad 100644 --- a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsignalblocker Test: ##################################################################### -qt_add_test(tst_qsignalblocker +qt_internal_add_test(tst_qsignalblocker SOURCES tst_qsignalblocker.cpp ) diff --git a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt index 9ce292c242..064b6722f8 100644 --- a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsignalmapper Test: ##################################################################### -qt_add_test(tst_qsignalmapper +qt_internal_add_test(tst_qsignalmapper SOURCES tst_qsignalmapper.cpp ) diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt index 2367a8a54e..d5b00ae69f 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qsocketnotifier Test: ##################################################################### -qt_add_test(tst_qsocketnotifier +qt_internal_add_test(tst_qsocketnotifier SOURCES tst_qsocketnotifier.cpp INCLUDE_DIRECTORIES @@ -25,7 +25,7 @@ qt_add_test(tst_qsocketnotifier ## Scopes: ##################################################################### -qt_extend_target(tst_qsocketnotifier CONDITION WIN32 +qt_internal_extend_target(tst_qsocketnotifier CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt index 0024c522e4..1c091bd979 100644 --- a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsystemsemaphore Test: ##################################################################### -qt_add_test(tst_qsystemsemaphore +qt_internal_add_test(tst_qsystemsemaphore SOURCES tst_qsystemsemaphore.cpp ) diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt index 74f7bf3f61..f34076350e 100644 --- a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt @@ -4,7 +4,7 @@ ## acquirerelease_helper Binary: ##################################################################### -qt_add_test_helper(acquirerelease_helper +qt_internal_add_test_helper(acquirerelease_helper SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt index d6e41f6344..39a40b6983 100644 --- a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtimer Test: ##################################################################### -qt_add_test(tst_qtimer +qt_internal_add_test(tst_qtimer SOURCES tst_qtimer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt index e1cefa3325..e6dc145472 100644 --- a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtranslator Test: ##################################################################### -qt_add_test(tst_qtranslator +qt_internal_add_test(tst_qtranslator SOURCES tst_qtranslator.cpp ) @@ -15,7 +15,7 @@ set(qtranslator_resource_files "hellotr_la.qm" ) -qt_add_resource(tst_qtranslator "qtranslator" +qt_internal_add_resource(tst_qtranslator "qtranslator" PREFIX "/tst_qtranslator" FILES @@ -35,7 +35,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "msgfmt_from_po.qm" ) - qt_add_resource(tst_qtranslator "android_testdata" + qt_internal_add_resource(tst_qtranslator "android_testdata" PREFIX "/android_testdata" FILES diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt deleted file mode 100644 index 9534e22368..0000000000 --- a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ -# Generated from qvariant.pro. - -##################################################################### -## tst_qvariant Test: -##################################################################### - -qt_add_test(tst_qvariant - SOURCES - tst_qvariant.cpp - DEFINES - QT_DISABLE_DEPRECATED_BEFORE=0 - INCLUDE_DIRECTORIES - ../../../other/qvariant_common - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui -) - -# Resources: -set(qvariant_resource_files - "stream/qt4.9/" - "stream/qt5.0/" -) - -qt_add_resource(tst_qvariant "qvariant" - PREFIX - "/" - FILES - ${qvariant_resource_files} -) - - -## Scopes: -##################################################################### - -qt_extend_target(tst_qvariant CONDITION MSVC - COMPILE_OPTIONS - /bigobj -) - -qt_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion - DEFINES - QT_NO_DOUBLECONVERSION -) diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt index 9534e22368..45bfa4e480 100644 --- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvariant Test: ##################################################################### -qt_add_test(tst_qvariant +qt_internal_add_test(tst_qvariant SOURCES tst_qvariant.cpp DEFINES @@ -22,7 +22,7 @@ set(qvariant_resource_files "stream/qt5.0/" ) -qt_add_resource(tst_qvariant "qvariant" +qt_internal_add_resource(tst_qvariant "qvariant" PREFIX "/" FILES @@ -33,12 +33,12 @@ qt_add_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### -qt_extend_target(tst_qvariant CONDITION MSVC +qt_internal_extend_target(tst_qvariant CONDITION MSVC COMPILE_OPTIONS /bigobj ) -qt_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_internal_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION ) diff --git a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt index 7974c3765b..b9bcb36771 100644 --- a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwineventnotifier Test: ##################################################################### -qt_add_test(tst_qwineventnotifier +qt_internal_add_test(tst_qwineventnotifier SOURCES tst_qwineventnotifier.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt index 592ef6e513..b3c0879605 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qmimedatabase-cache Test: ##################################################################### -qt_add_test(tst_qmimedatabase-cache +qt_internal_add_test(tst_qmimedatabase-cache SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-cache.cpp @@ -24,7 +24,7 @@ set(mimetypes_resource_files "mime/packages/freedesktop.org.xml" ) -qt_add_resource(tst_qmimedatabase-cache "mimetypes" +qt_internal_add_resource(tst_qmimedatabase-cache "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE @@ -75,7 +75,7 @@ set(testdata_resource_files "yast2-metapackage-handler-mimetypes.xml" ) -qt_add_resource(tst_qmimedatabase-cache "testdata" +qt_internal_add_resource(tst_qmimedatabase-cache "testdata" PREFIX "/qt-project.org/qmime" BASE @@ -91,7 +91,7 @@ qt_add_resource(tst_qmimedatabase-cache "testdata" ## Scopes: ##################################################################### -qt_extend_target(tst_qmimedatabase-cache CONDITION GCC +qt_internal_extend_target(tst_qmimedatabase-cache CONDITION GCC COMPILE_OPTIONS -W -Wall @@ -101,7 +101,7 @@ qt_extend_target(tst_qmimedatabase-cache CONDITION GCC -Wshadow ) -qt_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX +qt_internal_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX DEFINES USE_XDG_DATA_DIRS ) diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt index e47d721f54..b9ce8209f7 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qmimedatabase-cache Test: ##################################################################### -qt_add_test(tst_qmimedatabase-cache +qt_internal_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" ) -qt_add_resource(tst_qmimedatabase-cache "testdata" +qt_internal_add_resource(tst_qmimedatabase-cache "testdata" PREFIX "/qt-project.org/qmime" BASE @@ -87,7 +87,7 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-cache) ## Scopes: ##################################################################### -qt_extend_target(tst_qmimedatabase-cache CONDITION GCC +qt_internal_extend_target(tst_qmimedatabase-cache CONDITION GCC COMPILE_OPTIONS -W -Wall @@ -97,7 +97,7 @@ qt_extend_target(tst_qmimedatabase-cache CONDITION GCC -Wshadow ) -qt_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX +qt_internal_extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX DEFINES USE_XDG_DATA_DIRS ) diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt index d449343e56..b1cabd0b7e 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qmimedatabase-xml Test: ##################################################################### -qt_add_test(tst_qmimedatabase-xml +qt_internal_add_test(tst_qmimedatabase-xml SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-xml.cpp @@ -24,7 +24,7 @@ set(mimetypes_resource_files "mime/packages/freedesktop.org.xml" ) -qt_add_resource(tst_qmimedatabase-xml "mimetypes" +qt_internal_add_resource(tst_qmimedatabase-xml "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE @@ -75,7 +75,7 @@ set(testdata_resource_files "yast2-metapackage-handler-mimetypes.xml" ) -qt_add_resource(tst_qmimedatabase-xml "testdata" +qt_internal_add_resource(tst_qmimedatabase-xml "testdata" PREFIX "/qt-project.org/qmime" BASE @@ -91,7 +91,7 @@ qt_add_resource(tst_qmimedatabase-xml "testdata" ## Scopes: ##################################################################### -qt_extend_target(tst_qmimedatabase-xml CONDITION GCC +qt_internal_extend_target(tst_qmimedatabase-xml CONDITION GCC COMPILE_OPTIONS -W -Wall @@ -101,7 +101,7 @@ qt_extend_target(tst_qmimedatabase-xml CONDITION GCC -Wshadow ) -qt_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX +qt_internal_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX DEFINES USE_XDG_DATA_DIRS ) diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt index 45770cf247..ddc5b99baa 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qmimedatabase-xml Test: ##################################################################### -qt_add_test(tst_qmimedatabase-xml +qt_internal_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" ) -qt_add_resource(tst_qmimedatabase-xml "testdata" +qt_internal_add_resource(tst_qmimedatabase-xml "testdata" PREFIX "/qt-project.org/qmime" BASE @@ -87,7 +87,7 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-xml) ## Scopes: ##################################################################### -qt_extend_target(tst_qmimedatabase-xml CONDITION GCC +qt_internal_extend_target(tst_qmimedatabase-xml CONDITION GCC COMPILE_OPTIONS -W -Wall @@ -97,7 +97,7 @@ qt_extend_target(tst_qmimedatabase-xml CONDITION GCC -Wshadow ) -qt_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX +qt_internal_extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX DEFINES USE_XDG_DATA_DIRS ) diff --git a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt index 7637ef5d2d..bb84fce94f 100644 --- a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmimetype Test: ##################################################################### -qt_add_test(tst_qmimetype +qt_internal_add_test(tst_qmimetype SOURCES tst_qmimetype.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt index 2eaac94408..247c905d9e 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin1 Generic Library: ##################################################################### -qt_add_cmake_library(plugin1 +qt_internal_add_cmake_library(plugin1 MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -22,7 +22,7 @@ qt_add_cmake_library(plugin1 ## Scopes: ##################################################################### -qt_extend_target(plugin1 CONDITION NOT QT_FEATURE_library +qt_internal_extend_target(plugin1 CONDITION NOT QT_FEATURE_library DEFINES QT_STATICPLUGIN ) diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt index 0e0c589fc1..a384a40412 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt @@ -4,7 +4,7 @@ ## plugin2 Generic Library: ##################################################################### -qt_add_cmake_library(plugin2 +qt_internal_add_cmake_library(plugin2 MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -22,7 +22,7 @@ qt_add_cmake_library(plugin2 ## Scopes: ##################################################################### -qt_extend_target(plugin2 CONDITION NOT QT_FEATURE_library +qt_internal_extend_target(plugin2 CONDITION NOT QT_FEATURE_library DEFINES QT_STATICPLUGIN ) diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt index 9e3a686340..8b781536a4 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfactoryloader Test: ##################################################################### -qt_add_test(tst_qfactoryloader +qt_internal_add_test(tst_qfactoryloader OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../plugin1/plugininterface1.h @@ -17,7 +17,7 @@ qt_add_test(tst_qfactoryloader ## Scopes: ##################################################################### -qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library +qt_internal_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 ) - qt_add_resource(tst_qfactoryloader "qmake_libs" + qt_internal_add_resource(tst_qfactoryloader "qmake_libs" PREFIX "android_test_data" BASE diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt index 7d10294399..8515af2beb 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfactoryloader Test: ##################################################################### -qt_add_test(tst_qfactoryloader +qt_internal_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 -qt_extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library +qt_internal_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 - qt_add_resource(tst_qfactoryloader "qmake_libs" + qt_internal_add_resource(tst_qfactoryloader "qmake_libs" PREFIX "android_test_data" BASE diff --git a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt index b1435b77d3..93a2b1a455 100644 --- a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## mylib Generic Library: ##################################################################### -qt_add_cmake_library(mylib +qt_internal_add_cmake_library(mylib SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" @@ -22,7 +22,7 @@ qt_add_cmake_library(mylib ## Scopes: ##################################################################### -qt_extend_target(mylib CONDITION MSVC +qt_internal_extend_target(mylib CONDITION MSVC DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt index 41bd6bf252..4b2e01d997 100644 --- a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt @@ -4,7 +4,7 @@ ## mylib Generic Library: ##################################################################### -qt_add_cmake_library(mylib +qt_internal_add_cmake_library(mylib SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" @@ -37,7 +37,7 @@ endif() ## Scopes: ##################################################################### -qt_extend_target(mylib CONDITION MSVC +qt_internal_extend_target(mylib CONDITION MSVC DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt index a91b99f1c2..f92cec8fb1 100644 --- a/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt @@ -4,7 +4,7 @@ ## mylib Generic Library: ##################################################################### -add_cmake_library(mylib2 # special case +qt_internal_add_cmake_library(mylib2 # special case SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}tst_qlibrary" #OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case @@ -84,7 +84,7 @@ endif() ## Scopes: ##################################################################### -extend_target(mylib2 CONDITION MSVC # special case +qt_internal_extend_target(mylib2 CONDITION MSVC # special case DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt index c3af98df13..6e4ce15f44 100644 --- a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "../library_path/invalid.so") -qt_add_test(tst_qlibrary +qt_internal_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 ) - qt_add_resource(tst_qlibrary "qmake_libs" + qt_internal_add_resource(tst_qlibrary "qmake_libs" PREFIX "android_test_data" BASE diff --git a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt index a99b96c806..0f18c8dccc 100644 --- a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "../library_path/invalid.so") -qt_add_test(tst_qlibrary +qt_internal_add_test(tst_qlibrary OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qlibrary.cpp @@ -39,7 +39,7 @@ if(ANDROID) # special case end ) - qt_add_resource(tst_qlibrary "qmake_libs" + qt_internal_add_resource(tst_qlibrary "qmake_libs" PREFIX "android_test_data" BASE diff --git a/tests/auto/corelib/plugin/qplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/CMakeLists.txt index b2829099aa..2c901eff44 100644 --- a/tests/auto/corelib/plugin/qplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qplugin/CMakeLists.txt @@ -13,7 +13,7 @@ file(GLOB_RECURSE test_data_glob plugins/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qplugin +qt_internal_add_test(tst_qplugin SOURCES tst_qplugin.cpp LIBRARIES diff --git a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt index 379faad981..ee4c0cf33c 100644 --- a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## debugplugin Generic Library: ##################################################################### -qt_add_cmake_library(debugplugin +qt_internal_add_cmake_library(debugplugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins" SOURCES diff --git a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt index 0dc5a28edb..b9cdf2af05 100644 --- a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## invalidplugin Generic Library: ##################################################################### -qt_add_cmake_library(invalidplugin +qt_internal_add_cmake_library(invalidplugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins" SOURCES diff --git a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt index 0332bcc15b..abf3ae2a4d 100644 --- a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## releaseplugin Generic Library: ##################################################################### -qt_add_cmake_library(releaseplugin +qt_internal_add_cmake_library(releaseplugin MODULE OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins" SOURCES diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt index 64b1db677d..899ad6ca39 100644 --- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## almostplugin Generic Library: ##################################################################### -qt_add_cmake_library(almostplugin +qt_internal_add_cmake_library(almostplugin MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -22,7 +22,7 @@ qt_add_cmake_library(almostplugin ## Scopes: ##################################################################### -qt_extend_target(almostplugin CONDITION GCC +qt_internal_extend_target(almostplugin CONDITION GCC LINK_OPTIONS "--Wl,--no-undefined" ) diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt index c8a320d2cf..fe5d6295aa 100644 --- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## almostplugin Generic Library: ##################################################################### -qt_add_cmake_library(almostplugin +qt_internal_add_cmake_library(almostplugin MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -25,7 +25,7 @@ qt_add_cmake_library(almostplugin qt_autogen_tools_initial_setup(almostplugin) # special case begin # We want the opposite of this -#qt_extend_target(almostplugin CONDITION GCC +#qt_internal_extend_target(almostplugin CONDITION GCC # LINK_OPTIONS # "--Wl,--no-undefined" #) diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt index b5ae34e9df..61de9dd479 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpluginloaderlib Generic Library: ##################################################################### -qt_add_cmake_library(tst_qpluginloaderlib +qt_internal_add_cmake_library(tst_qpluginloaderlib SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -22,7 +22,7 @@ qt_add_cmake_library(tst_qpluginloaderlib ## Scopes: ##################################################################### -qt_extend_target(tst_qpluginloaderlib CONDITION MSVC +qt_internal_extend_target(tst_qpluginloaderlib CONDITION MSVC DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt index f760ce9935..7914f07c0d 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpluginloaderlib Generic Library: ##################################################################### -qt_add_cmake_library(tst_qpluginloaderlib +qt_internal_add_cmake_library(tst_qpluginloaderlib SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -29,7 +29,7 @@ endif() ## Scopes: ##################################################################### -qt_extend_target(tst_qpluginloaderlib CONDITION MSVC +qt_internal_extend_target(tst_qpluginloaderlib CONDITION MSVC DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt index bfc30d7c1d..1448ff3933 100644 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## staticplugin Generic Library: ##################################################################### -add_cmake_library(staticplugin +qt_internal_add_cmake_library(staticplugin STATIC SOURCES main.cpp @@ -21,3 +21,5 @@ add_cmake_library(staticplugin # TEMPLATE = "lib" qt_autogen_tools_initial_setup(staticplugin) + +target_compile_definitions(staticplugin PRIVATE QT_STATICPLUGIN) diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt index 0eb42728f4..1448ff3933 100644 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## staticplugin Generic Library: ##################################################################### -qt_add_cmake_library(staticplugin +qt_internal_add_cmake_library(staticplugin STATIC SOURCES main.cpp diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt index ef39d6cc0f..5a8bf518c5 100644 --- a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## theplugin Generic Library: ##################################################################### -qt_add_cmake_library(theplugin +qt_internal_add_cmake_library(theplugin MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt deleted file mode 100644 index 0b0d76bbc4..0000000000 --- a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -# Generated from tst.pro. - -##################################################################### -## tst_qpluginloader Test: -##################################################################### - -# Collect test data -list(APPEND test_data "../elftest") -list(APPEND test_data "../machtest") - -qt_add_test(tst_qpluginloader - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - SOURCES - ../fakeplugin.cpp - ../theplugin/plugininterface.h - ../tst_qpluginloader.cpp - PUBLIC_LIBRARIES - staticplugin - TESTDATA ${test_data} -) - -## Scopes: -##################################################################### - -qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests - PUBLIC_LIBRARIES - Qt::CorePrivate -) - -qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release - PUBLIC_LIBRARIES - # Remove: L../staticplugin/debug -) - -qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug - PUBLIC_LIBRARIES - # Remove: L../staticplugin/release -) - -qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release - PUBLIC_LIBRARIES - # Remove: L../staticplugin -) diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt index 0b0d76bbc4..1193a9d731 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "../elftest") list(APPEND test_data "../machtest") -qt_add_test(tst_qpluginloader +qt_internal_add_test(tst_qpluginloader OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../fakeplugin.cpp @@ -22,22 +22,22 @@ qt_add_test(tst_qpluginloader ## Scopes: ##################################################################### -qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests PUBLIC_LIBRARIES Qt::CorePrivate ) -qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release +qt_internal_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release PUBLIC_LIBRARIES # Remove: L../staticplugin/debug ) -qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug +qt_internal_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug PUBLIC_LIBRARIES # Remove: L../staticplugin/release ) -qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release +qt_internal_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release PUBLIC_LIBRARIES # Remove: L../staticplugin ) diff --git a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt index 05ed8f84ac..5e0aec0f33 100644 --- a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_quuid Test: ##################################################################### -qt_add_test(tst_quuid +qt_internal_add_test(tst_quuid SOURCES ../tst_quuid.cpp ) @@ -12,7 +12,7 @@ qt_add_test(tst_quuid ## Scopes: ##################################################################### -qt_extend_target(tst_quuid CONDITION APPLE +qt_internal_extend_target(tst_quuid CONDITION APPLE SOURCES ../tst_quuid_darwin.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt index 1ba9de95ca..51712cfc05 100644 --- a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt +++ b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_quuid Test: ##################################################################### -qt_add_test(tst_quuid +qt_internal_add_test(tst_quuid OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_quuid.cpp @@ -13,7 +13,7 @@ qt_add_test(tst_quuid ## Scopes: ##################################################################### -qt_extend_target(tst_quuid CONDITION APPLE +qt_internal_extend_target(tst_quuid CONDITION APPLE SOURCES ../tst_quuid_darwin.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt index eaa9d4e281..e1b5814f41 100644 --- a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessUniqueness Binary: ##################################################################### -qt_add_executable(testProcessUniqueness +qt_internal_add_executable(testProcessUniqueness INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_quuid/testProcessUniqueness" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt index ad5192261d..0bdf32a207 100644 --- a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt +++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt @@ -4,7 +4,7 @@ ## testProcessUniqueness Binary: ##################################################################### -qt_add_executable(testProcessUniqueness +qt_internal_add_executable(testProcessUniqueness INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_quuid/testProcessUniqueness" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt index f2d0d9d54c..f8e209e620 100644 --- a/tests/auto/corelib/serialization/json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/json/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_json Test: ##################################################################### -qt_add_test(tst_json +qt_internal_add_test(tst_json SOURCES tst_qtjson.cpp PUBLIC_LIBRARIES @@ -26,7 +26,7 @@ if(ANDROID) "test3.json" ) - qt_add_resource(tst_json "json" + qt_internal_add_resource(tst_json "json" PREFIX "/" FILES @@ -34,7 +34,7 @@ if(ANDROID) ) endif() -qt_extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_internal_extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION ) diff --git a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt index 74d4e692df..eb5061652e 100644 --- a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcborstreamreader Test: ##################################################################### -qt_add_test(tst_qcborstreamreader +qt_internal_add_test(tst_qcborstreamreader SOURCES tst_qcborstreamreader.cpp DEFINES diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt index 33707ff24f..b39e1b7917 100644 --- a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcborstreamwriter Test: ##################################################################### -qt_add_test(tst_qcborstreamwriter +qt_internal_add_test(tst_qcborstreamwriter SOURCES tst_qcborstreamwriter.cpp DEFINES diff --git a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt index 3877e565cd..0a8464c756 100644 --- a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcborvalue Test: ##################################################################### -qt_add_test(tst_qcborvalue +qt_internal_add_test(tst_qcborvalue SOURCES tst_qcborvalue.cpp DEFINES diff --git a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt index 8801d67783..d27ae46677 100644 --- a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcborvalue_json Test: ##################################################################### -qt_add_test(tst_qcborvalue_json +qt_internal_add_test(tst_qcborvalue_json SOURCES tst_qcborvalue_json.cpp DEFINES diff --git a/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt index a293f87155..91e4e31783 100644 --- a/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "datastream.q42") -add_qt_test(tst_qdatastream +qt_internal_add_test(tst_qdatastream SOURCES tst_qdatastream.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "datastream.q42" ) - add_qt_resource(tst_qdatastream "testdata" + qt_internal_add_resource(tst_qdatastream "testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt index 35a62fe00c..91e4e31783 100644 --- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "datastream.q42") -qt_add_test(tst_qdatastream +qt_internal_add_test(tst_qdatastream SOURCES tst_qdatastream.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "datastream.q42" ) - qt_add_resource(tst_qdatastream "testdata" + qt_internal_add_resource(tst_qdatastream "testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt index 91280c79b3..b77b8212fb 100644 --- a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdatastream_core_pixmap Test: ##################################################################### -qt_add_test(tst_qdatastream_core_pixmap +qt_internal_add_test(tst_qdatastream_core_pixmap SOURCES tst_qdatastream_core_pixmap.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt index 160b63f809..785785d43a 100644 --- a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt @@ -4,7 +4,7 @@ ## readAllStdinProcess Binary: ##################################################################### -qt_add_executable(readAllStdinProcess +qt_internal_add_executable(readAllStdinProcess INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readAllStdinProcess" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt index 399e9f44a5..897444c9af 100644 --- a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt @@ -4,7 +4,7 @@ ## readLineStdinProcess Binary: ##################################################################### -qt_add_executable(readLineStdinProcess +qt_internal_add_executable(readLineStdinProcess INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readLineStdinProcess" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt index 3e5383fdc1..73eccd1ed8 100644 --- a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt @@ -4,7 +4,7 @@ ## stdinProcess Binary: ##################################################################### -qt_add_executable(stdinProcess +qt_internal_add_executable(stdinProcess INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/stdinProcess" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt index 4471335770..61d594900f 100644 --- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt @@ -12,7 +12,7 @@ list(APPEND test_data "../tst_qtextstream.cpp") list(APPEND test_data "../resources") list(APPEND test_data "../BLACKLIST") -qt_add_test(tst_qtextstream +qt_internal_add_test(tst_qtextstream OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../../../../../shared/emulationdetector.h @@ -36,7 +36,7 @@ set(qtextstream_resource_files "resources/little_endian/" ) -qt_add_resource(tst_qtextstream "qtextstream" +qt_internal_add_resource(tst_qtextstream "qtextstream" PREFIX "/tst_textstream/" BASE @@ -49,7 +49,7 @@ qt_add_resource(tst_qtextstream "qtextstream" ## Scopes: ##################################################################### -qt_extend_target(tst_qtextstream CONDITION builtin_testdata +qt_internal_extend_target(tst_qtextstream CONDITION builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt index 0039214d6b..aae8b9f1e9 100644 --- a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "data") list(APPEND test_data "XML-Test-Suite") -qt_add_test(tst_qxmlstream +qt_internal_add_test(tst_qxmlstream SOURCES tst_qxmlstream.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/text/qbytearray/CMakeLists.txt b/tests/auto/corelib/text/qbytearray/CMakeLists.txt index f2fd281f90..bc07b2e1af 100644 --- a/tests/auto/corelib/text/qbytearray/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearray/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "rfc3252.txt") -qt_add_test(tst_qbytearray +qt_internal_add_test(tst_qbytearray SOURCES tst_qbytearray.cpp PUBLIC_LIBRARIES @@ -18,7 +18,7 @@ qt_add_test(tst_qbytearray ## Scopes: ##################################################################### -qt_extend_target(tst_qbytearray CONDITION APPLE +qt_internal_extend_target(tst_qbytearray CONDITION APPLE SOURCES tst_qbytearray_mac.mm PUBLIC_LIBRARIES @@ -31,7 +31,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "rfc3252.txt" ) - qt_add_resource(tst_qbytearray "android_testdata" + qt_internal_add_resource(tst_qbytearray "android_testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/text/qbytearrayapisymmetry/CMakeLists.txt b/tests/auto/corelib/text/qbytearrayapisymmetry/CMakeLists.txt index bc49aabc5b..68689a4b79 100644 --- a/tests/auto/corelib/text/qbytearrayapisymmetry/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearrayapisymmetry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbytearrayapisymmetry Test: ##################################################################### -qt_add_test(tst_qbytearrayapisymmetry +qt_internal_add_test(tst_qbytearrayapisymmetry SOURCES tst_qbytearrayapisymmetry.cpp ) diff --git a/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt b/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt index a7b9578d5f..4add3dabe4 100644 --- a/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbytearraylist Test: ##################################################################### -qt_add_test(tst_qbytearraylist +qt_internal_add_test(tst_qbytearraylist SOURCES tst_qbytearraylist.cpp ) diff --git a/tests/auto/corelib/text/qbytearraymatcher/CMakeLists.txt b/tests/auto/corelib/text/qbytearraymatcher/CMakeLists.txt index 75da499064..a70d8d91b6 100644 --- a/tests/auto/corelib/text/qbytearraymatcher/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearraymatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbytearraymatcher Test: ##################################################################### -qt_add_test(tst_qbytearraymatcher +qt_internal_add_test(tst_qbytearraymatcher SOURCES tst_qbytearraymatcher.cpp ) diff --git a/tests/auto/corelib/text/qbytearrayview/CMakeLists.txt b/tests/auto/corelib/text/qbytearrayview/CMakeLists.txt index 34476b8246..43a0e09ce3 100644 --- a/tests/auto/corelib/text/qbytearrayview/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearrayview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbytearrayview Test: ##################################################################### -qt_add_test(tst_qbytearrayview +qt_internal_add_test(tst_qbytearrayview SOURCES tst_qbytearrayview.cpp ) diff --git a/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt b/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt index 5262e009cd..3d4010c3f3 100644 --- a/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbytedatabuffer Test: ##################################################################### -qt_add_test(tst_qbytedatabuffer +qt_internal_add_test(tst_qbytedatabuffer SOURCES tst_qbytedatabuffer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/text/qchar/CMakeLists.txt b/tests/auto/corelib/text/qchar/CMakeLists.txt index ae4bc1f23d..529fa39bd9 100644 --- a/tests/auto/corelib/text/qchar/CMakeLists.txt +++ b/tests/auto/corelib/text/qchar/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "data/NormalizationTest.txt") -qt_add_test(tst_qchar +qt_internal_add_test(tst_qchar SOURCES tst_qchar.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "data/NormalizationTest.txt" ) - qt_add_resource(tst_qchar "testdata" + qt_internal_add_resource(tst_qchar "testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/text/qcollator/CMakeLists.txt b/tests/auto/corelib/text/qcollator/CMakeLists.txt index 105a65310e..8112ecb887 100644 --- a/tests/auto/corelib/text/qcollator/CMakeLists.txt +++ b/tests/auto/corelib/text/qcollator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcollator Test: ##################################################################### -qt_add_test(tst_qcollator +qt_internal_add_test(tst_qcollator SOURCES tst_qcollator.cpp DEFINES diff --git a/tests/auto/corelib/text/qlatin1string/CMakeLists.txt b/tests/auto/corelib/text/qlatin1string/CMakeLists.txt index 9c929b3893..4d37ebb04c 100644 --- a/tests/auto/corelib/text/qlatin1string/CMakeLists.txt +++ b/tests/auto/corelib/text/qlatin1string/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlatin1string Test: ##################################################################### -qt_add_test(tst_qlatin1string +qt_internal_add_test(tst_qlatin1string SOURCES tst_qlatin1string.cpp DEFINES diff --git a/tests/auto/corelib/text/qlocale/syslocaleapp/CMakeLists.txt b/tests/auto/corelib/text/qlocale/syslocaleapp/CMakeLists.txt index 68c6c5e3b6..3b7df027d4 100644 --- a/tests/auto/corelib/text/qlocale/syslocaleapp/CMakeLists.txt +++ b/tests/auto/corelib/text/qlocale/syslocaleapp/CMakeLists.txt @@ -4,7 +4,7 @@ ## syslocaleapp Binary: ##################################################################### -qt_add_executable(syslocaleapp +qt_internal_add_executable(syslocaleapp OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES syslocaleapp.cpp diff --git a/tests/auto/corelib/text/qlocale/test/CMakeLists.txt b/tests/auto/corelib/text/qlocale/test/CMakeLists.txt index 399b22327e..863252cf77 100644 --- a/tests/auto/corelib/text/qlocale/test/CMakeLists.txt +++ b/tests/auto/corelib/text/qlocale/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlocale Test: ##################################################################### -qt_add_test(tst_qlocale +qt_internal_add_test(tst_qlocale OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qlocale.cpp @@ -15,12 +15,12 @@ qt_add_test(tst_qlocale ## Scopes: ##################################################################### -qt_extend_target(tst_qlocale CONDITION embedded +qt_internal_extend_target(tst_qlocale CONDITION embedded PUBLIC_LIBRARIES Qt::Gui ) -qt_extend_target(tst_qlocale CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_internal_extend_target(tst_qlocale CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION ) diff --git a/tests/auto/corelib/text/qregularexpression/CMakeLists.txt b/tests/auto/corelib/text/qregularexpression/CMakeLists.txt index 2ea0cfad7d..78e842b658 100644 --- a/tests/auto/corelib/text/qregularexpression/CMakeLists.txt +++ b/tests/auto/corelib/text/qregularexpression/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qregularexpression Test: ##################################################################### -qt_add_test(tst_qregularexpression +qt_internal_add_test(tst_qregularexpression SOURCES tst_qregularexpression.cpp ) diff --git a/tests/auto/corelib/text/qstring/CMakeLists.txt b/tests/auto/corelib/text/qstring/CMakeLists.txt index 8451e0fcb4..e5f64742a2 100644 --- a/tests/auto/corelib/text/qstring/CMakeLists.txt +++ b/tests/auto/corelib/text/qstring/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstring Test: ##################################################################### -qt_add_test(tst_qstring +qt_internal_add_test(tst_qstring SOURCES tst_qstring.cpp DEFINES @@ -16,12 +16,12 @@ qt_add_test(tst_qstring ## Scopes: ##################################################################### -qt_extend_target(tst_qstring CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_internal_extend_target(tst_qstring CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION ) -qt_extend_target(tst_qstring CONDITION APPLE +qt_internal_extend_target(tst_qstring CONDITION APPLE SOURCES tst_qstring_mac.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt index 030d678e94..10771fc04a 100644 --- a/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt +++ b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstring_no_cast_from_bytearray Test: ##################################################################### -qt_add_test(tst_qstring_no_cast_from_bytearray +qt_internal_add_test(tst_qstring_no_cast_from_bytearray SOURCES tst_qstring_no_cast_from_bytearray.cpp DEFINES diff --git a/tests/auto/corelib/text/qstringapisymmetry/CMakeLists.txt b/tests/auto/corelib/text/qstringapisymmetry/CMakeLists.txt index 48042fc32e..2d82e361fb 100644 --- a/tests/auto/corelib/text/qstringapisymmetry/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringapisymmetry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringapisymmetry Test: ##################################################################### -qt_add_test(tst_qstringapisymmetry +qt_internal_add_test(tst_qstringapisymmetry SOURCES tst_qstringapisymmetry.cpp ) diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt index 2c897ddcd3..2b28032657 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringbuilder1 Test: ##################################################################### -qt_add_test(tst_qstringbuilder1 +qt_internal_add_test(tst_qstringbuilder1 SOURCES tst_qstringbuilder1.cpp ) diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt index 7b5b96aef3..274be115d9 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringbuilder2 Test: ##################################################################### -qt_add_test(tst_qstringbuilder2 +qt_internal_add_test(tst_qstringbuilder2 SOURCES tst_qstringbuilder2.cpp ) diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt index 3293f26e5c..a1c4298f99 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringbuilder3 Test: ##################################################################### -qt_add_test(tst_qstringbuilder3 +qt_internal_add_test(tst_qstringbuilder3 SOURCES tst_qstringbuilder3.cpp ) diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt index 55c4400acf..b0dbcbf83a 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringbuilder4 Test: ##################################################################### -qt_add_test(tst_qstringbuilder4 +qt_internal_add_test(tst_qstringbuilder4 SOURCES tst_qstringbuilder4.cpp ) diff --git a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt index 582e4fcf93..5b5eee953e 100644 --- a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringconverter Test: ##################################################################### -qt_add_test(tst_qstringconverter +qt_internal_add_test(tst_qstringconverter SOURCES tst_qstringconverter.cpp ) diff --git a/tests/auto/corelib/text/qstringiterator/CMakeLists.txt b/tests/auto/corelib/text/qstringiterator/CMakeLists.txt index 96b34e9d23..36b62a248b 100644 --- a/tests/auto/corelib/text/qstringiterator/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringiterator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringiterator Test: ##################################################################### -qt_add_test(tst_qstringiterator +qt_internal_add_test(tst_qstringiterator SOURCES tst_qstringiterator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/text/qstringlist/CMakeLists.txt b/tests/auto/corelib/text/qstringlist/CMakeLists.txt index c41403227b..e9272aa0b6 100644 --- a/tests/auto/corelib/text/qstringlist/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringlist Test: ##################################################################### -qt_add_test(tst_qstringlist +qt_internal_add_test(tst_qstringlist SOURCES tst_qstringlist.cpp ) diff --git a/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt b/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt index 1cce5690ce..ae055089a8 100644 --- a/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringmatcher Test: ##################################################################### -qt_add_test(tst_qstringmatcher +qt_internal_add_test(tst_qstringmatcher SOURCES tst_qstringmatcher.cpp DEFINES diff --git a/tests/auto/corelib/text/qstringtokenizer/CMakeLists.txt b/tests/auto/corelib/text/qstringtokenizer/CMakeLists.txt index 5928e5b99a..67b044e445 100644 --- a/tests/auto/corelib/text/qstringtokenizer/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringtokenizer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringtokenizer Test: ##################################################################### -qt_add_test(tst_qstringtokenizer +qt_internal_add_test(tst_qstringtokenizer SOURCES tst_qstringtokenizer.cpp ) diff --git a/tests/auto/corelib/text/qstringview/CMakeLists.txt b/tests/auto/corelib/text/qstringview/CMakeLists.txt index aefcf6a1ee..34c145a498 100644 --- a/tests/auto/corelib/text/qstringview/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstringview Test: ##################################################################### -qt_add_test(tst_qstringview +qt_internal_add_test(tst_qstringview SOURCES tst_qstringview.cpp ) diff --git a/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt b/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt index 93d858a96a..e9b0da83a6 100644 --- a/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt +++ b/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "data") -qt_add_test(tst_qtextboundaryfinder +qt_internal_add_test(tst_qtextboundaryfinder SOURCES tst_qtextboundaryfinder.cpp TESTDATA ${test_data} @@ -25,7 +25,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "data/WordBreakTest.txt" ) - qt_add_resource(tst_qtextboundaryfinder "testdata" + qt_internal_add_resource(tst_qtextboundaryfinder "testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/thread/qatomicint/CMakeLists.txt b/tests/auto/corelib/thread/qatomicint/CMakeLists.txt index d3d30f5928..867388cfbf 100644 --- a/tests/auto/corelib/thread/qatomicint/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicint/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicint Test: ##################################################################### -qt_add_test(tst_qatomicint +qt_internal_add_test(tst_qatomicint SOURCES tst_qatomicint.cpp ) diff --git a/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt index 527302cdd4..57601dc0e4 100644 --- a/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_char Test: ##################################################################### -qt_add_test(tst_qatomicinteger_char +qt_internal_add_test(tst_qatomicinteger_char SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt index 6fb1c8e975..6ac58c9136 100644 --- a/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_char16_t Test: ##################################################################### -qt_add_test(tst_qatomicinteger_char16_t +qt_internal_add_test(tst_qatomicinteger_char16_t SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt index 9a42a2ef09..911e9f5067 100644 --- a/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_char32_t Test: ##################################################################### -qt_add_test(tst_qatomicinteger_char32_t +qt_internal_add_test(tst_qatomicinteger_char32_t SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt index 32a529ea60..be59e2dc98 100644 --- a/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_int Test: ##################################################################### -qt_add_test(tst_qatomicinteger_int +qt_internal_add_test(tst_qatomicinteger_int SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt index 974cb2bb9d..3f632ff212 100644 --- a/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_long Test: ##################################################################### -qt_add_test(tst_qatomicinteger_long +qt_internal_add_test(tst_qatomicinteger_long SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt index bbee7fcb85..3de9227bb1 100644 --- a/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_qlonglong Test: ##################################################################### -qt_add_test(tst_qatomicinteger_qlonglong +qt_internal_add_test(tst_qatomicinteger_qlonglong SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt index 9dbff18228..cc6b5126d9 100644 --- a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_qptrdiff Test: ##################################################################### -qt_add_test(tst_qatomicinteger_qptrdiff +qt_internal_add_test(tst_qatomicinteger_qptrdiff SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt index f5ef36f407..44cf39f06d 100644 --- a/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_quintptr Test: ##################################################################### -qt_add_test(tst_qatomicinteger_quintptr +qt_internal_add_test(tst_qatomicinteger_quintptr SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt index 5a783b941e..18d3e384b9 100644 --- a/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_qulonglong Test: ##################################################################### -qt_add_test(tst_qatomicinteger_qulonglong +qt_internal_add_test(tst_qatomicinteger_qulonglong SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt index 869473d0c9..760967532a 100644 --- a/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_schar Test: ##################################################################### -qt_add_test(tst_qatomicinteger_schar +qt_internal_add_test(tst_qatomicinteger_schar SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt index a90621584e..3f762e34ab 100644 --- a/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_short Test: ##################################################################### -qt_add_test(tst_qatomicinteger_short +qt_internal_add_test(tst_qatomicinteger_short SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt index a2ee999970..912365a6e9 100644 --- a/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_uchar Test: ##################################################################### -qt_add_test(tst_qatomicinteger_uchar +qt_internal_add_test(tst_qatomicinteger_uchar SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt index f1eec6140f..725fa91704 100644 --- a/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_uint Test: ##################################################################### -qt_add_test(tst_qatomicinteger_uint +qt_internal_add_test(tst_qatomicinteger_uint SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt index eba2944e44..d5d35f587d 100644 --- a/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_ulong Test: ##################################################################### -qt_add_test(tst_qatomicinteger_ulong +qt_internal_add_test(tst_qatomicinteger_ulong SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt index fe19fc42fc..fd7c002345 100644 --- a/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_ushort Test: ##################################################################### -qt_add_test(tst_qatomicinteger_ushort +qt_internal_add_test(tst_qatomicinteger_ushort SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt index dfc4e6ee37..aecb81005c 100644 --- a/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicinteger_wchar_t Test: ##################################################################### -qt_add_test(tst_qatomicinteger_wchar_t +qt_internal_add_test(tst_qatomicinteger_wchar_t SOURCES ../tst_qatomicinteger.cpp DEFINES diff --git a/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt b/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt index 09c8c448df..2c3f32d7e3 100644 --- a/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt +++ b/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qatomicpointer Test: ##################################################################### -qt_add_test(tst_qatomicpointer +qt_internal_add_test(tst_qatomicpointer SOURCES tst_qatomicpointer.cpp ) diff --git a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt index 6908bd678c..8869f1ba84 100644 --- a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfuture Test: ##################################################################### -qt_add_test(tst_qfuture +qt_internal_add_test(tst_qfuture SOURCES tst_qfuture.cpp DEFINES diff --git a/tests/auto/corelib/thread/qfuture/CMakeLists.txt b/tests/auto/corelib/thread/qfuture/CMakeLists.txt index 6fdfc977e9..dcf7846fd2 100644 --- a/tests/auto/corelib/thread/qfuture/CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfuture Test: ##################################################################### -qt_add_test(tst_qfuture +qt_internal_add_test(tst_qfuture SOURCES tst_qfuture.cpp # DEFINES diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt b/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt index 3ebd266084..e41b8e70c6 100644 --- a/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfuturesynchronizer Test: ##################################################################### -qt_add_test(tst_qfuturesynchronizer +qt_internal_add_test(tst_qfuturesynchronizer SOURCES tst_qfuturesynchronizer.cpp ) diff --git a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt index a6771e538e..93ac2dd870 100644 --- a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfuturewatcher Test: ##################################################################### -qt_add_test(tst_qfuturewatcher +qt_internal_add_test(tst_qfuturewatcher SOURCES tst_qfuturewatcher.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/thread/qmutex/CMakeLists.txt b/tests/auto/corelib/thread/qmutex/CMakeLists.txt index ee7bcde85f..41b7b1da68 100644 --- a/tests/auto/corelib/thread/qmutex/CMakeLists.txt +++ b/tests/auto/corelib/thread/qmutex/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmutex Test: ##################################################################### -qt_add_test(tst_qmutex +qt_internal_add_test(tst_qmutex SOURCES tst_qmutex.cpp ) @@ -12,7 +12,7 @@ qt_add_test(tst_qmutex ## Scopes: ##################################################################### -qt_extend_target(tst_qmutex CONDITION WIN32 +qt_internal_extend_target(tst_qmutex CONDITION WIN32 PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt b/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt index 2f85dd512f..b73d0d073d 100644 --- a/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt +++ b/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmutexlocker Test: ##################################################################### -qt_add_test(tst_qmutexlocker +qt_internal_add_test(tst_qmutexlocker SOURCES tst_qmutexlocker.cpp ) diff --git a/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt deleted file mode 100644 index dc25a38fea..0000000000 --- a/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Generated from qpromise.pro. - -##################################################################### -## tst_qpromise Test: -##################################################################### - -qt_add_test(tst_qpromise - SOURCES - tst_qpromise.cpp - PUBLIC_LIBRARIES - Qt::CorePrivate -) diff --git a/tests/auto/corelib/thread/qpromise/CMakeLists.txt b/tests/auto/corelib/thread/qpromise/CMakeLists.txt index dc25a38fea..b841c7812b 100644 --- a/tests/auto/corelib/thread/qpromise/CMakeLists.txt +++ b/tests/auto/corelib/thread/qpromise/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpromise Test: ##################################################################### -qt_add_test(tst_qpromise +qt_internal_add_test(tst_qpromise SOURCES tst_qpromise.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt b/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt index 245fb52dfc..da6091d588 100644 --- a/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt +++ b/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qreadlocker Test: ##################################################################### -qt_add_test(tst_qreadlocker +qt_internal_add_test(tst_qreadlocker SOURCES tst_qreadlocker.cpp ) diff --git a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt index fbd8ebf408..4b81229024 100644 --- a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt +++ b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qreadwritelock Test: ##################################################################### -qt_add_test(tst_qreadwritelock +qt_internal_add_test(tst_qreadwritelock SOURCES tst_qreadwritelock.cpp ) diff --git a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt index c75794cb25..ca30061d15 100644 --- a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt +++ b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qresultstore Test: ##################################################################### -qt_add_test(tst_qresultstore +qt_internal_add_test(tst_qresultstore SOURCES tst_qresultstore.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt b/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt index d83e088004..1860347448 100644 --- a/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt +++ b/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsemaphore Test: ##################################################################### -qt_add_test(tst_qsemaphore +qt_internal_add_test(tst_qsemaphore SOURCES tst_qsemaphore.cpp ) diff --git a/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt deleted file mode 100644 index 2c92a710b3..0000000000 --- a/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Generated from qthread.pro. - -##################################################################### -## tst_qthread Test: -##################################################################### - -qt_add_test(tst_qthread - SOURCES - ../../../../shared/emulationdetector.h - tst_qthread.cpp - INCLUDE_DIRECTORIES - ../../../../shared -) - -## Scopes: -##################################################################### diff --git a/tests/auto/corelib/thread/qthread/CMakeLists.txt b/tests/auto/corelib/thread/qthread/CMakeLists.txt index 2c92a710b3..b3662f31da 100644 --- a/tests/auto/corelib/thread/qthread/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthread/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qthread Test: ##################################################################### -qt_add_test(tst_qthread +qt_internal_add_test(tst_qthread SOURCES ../../../../shared/emulationdetector.h tst_qthread.cpp diff --git a/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt b/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt index 1b5b77cfd8..cd4aaa5d72 100644 --- a/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qthreadonce Test: ##################################################################### -qt_add_test(tst_qthreadonce +qt_internal_add_test(tst_qthreadonce SOURCES qthreadonce.cpp tst_qthreadonce.cpp diff --git a/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt b/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt index 8d2c3719c6..ebf9fc104f 100644 --- a/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qthreadpool Test: ##################################################################### -qt_add_test(tst_qthreadpool +qt_internal_add_test(tst_qthreadpool SOURCES tst_qthreadpool.cpp ) diff --git a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt index e57f0c71ac..1340b30388 100644 --- a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt @@ -5,7 +5,7 @@ ## tst_qthreadstorage Test: ##################################################################### -add_qt_test(tst_qthreadstorage +qt_internal_add_test(tst_qthreadstorage SOURCES tst_qthreadstorage.cpp ) diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt index 8a8e24587d..eaf743ab86 100644 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## crashonexit Binary: ##################################################################### -qt_add_executable(crashonexit +qt_internal_add_executable(crashonexit OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit" INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit" SOURCES diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt index 0951c7df53..a6de9678c0 100644 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt @@ -4,7 +4,7 @@ ## crashonexit Binary: ##################################################################### -qt_add_executable(crashOnExit_helper # special case +qt_internal_add_executable(crashOnExit_helper # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" # special case SOURCES diff --git a/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt index 91db59c391..e600ff3a42 100644 --- a/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt +++ b/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwaitcondition Test: ##################################################################### -qt_add_test(tst_qwaitcondition +qt_internal_add_test(tst_qwaitcondition SOURCES tst_qwaitcondition.cpp ) diff --git a/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt b/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt index 5db1124951..200fa2ee3c 100644 --- a/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt +++ b/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwritelocker Test: ##################################################################### -qt_add_test(tst_qwritelocker +qt_internal_add_test(tst_qwritelocker SOURCES tst_qwritelocker.cpp ) diff --git a/tests/auto/corelib/time/qcalendar/CMakeLists.txt b/tests/auto/corelib/time/qcalendar/CMakeLists.txt index 12365467fb..4a8ab7f846 100644 --- a/tests/auto/corelib/time/qcalendar/CMakeLists.txt +++ b/tests/auto/corelib/time/qcalendar/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcalendar Test: ##################################################################### -qt_add_test(tst_qcalendar +qt_internal_add_test(tst_qcalendar SOURCES tst_qcalendar.cpp ) diff --git a/tests/auto/corelib/time/qdate/CMakeLists.txt b/tests/auto/corelib/time/qdate/CMakeLists.txt index 484ea08a7a..647be9a6f8 100644 --- a/tests/auto/corelib/time/qdate/CMakeLists.txt +++ b/tests/auto/corelib/time/qdate/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdate Test: ##################################################################### -qt_add_test(tst_qdate +qt_internal_add_test(tst_qdate SOURCES tst_qdate.cpp DEFINES diff --git a/tests/auto/corelib/time/qdatetime/CMakeLists.txt b/tests/auto/corelib/time/qdatetime/CMakeLists.txt index e27559c401..c5b8d2bb6e 100644 --- a/tests/auto/corelib/time/qdatetime/CMakeLists.txt +++ b/tests/auto/corelib/time/qdatetime/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdatetime Test: ##################################################################### -qt_add_test(tst_qdatetime +qt_internal_add_test(tst_qdatetime SOURCES tst_qdatetime.cpp DEFINES @@ -21,7 +21,7 @@ qt_add_test(tst_qdatetime # QMAKE_CFLAGS_RELEASE = "--O1" # QMAKE_CXXFLAGS_RELEASE = "--O1" -qt_extend_target(tst_qdatetime CONDITION APPLE +qt_internal_extend_target(tst_qdatetime CONDITION APPLE SOURCES tst_qdatetime_mac.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/time/qtime/CMakeLists.txt b/tests/auto/corelib/time/qtime/CMakeLists.txt index df3adf3649..6d3034c595 100644 --- a/tests/auto/corelib/time/qtime/CMakeLists.txt +++ b/tests/auto/corelib/time/qtime/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtime Test: ##################################################################### -qt_add_test(tst_qtime +qt_internal_add_test(tst_qtime SOURCES tst_qtime.cpp DEFINES diff --git a/tests/auto/corelib/time/qtimezone/CMakeLists.txt b/tests/auto/corelib/time/qtimezone/CMakeLists.txt index b97b2f9fd1..160ade2afd 100644 --- a/tests/auto/corelib/time/qtimezone/CMakeLists.txt +++ b/tests/auto/corelib/time/qtimezone/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtimezone Test: ##################################################################### -qt_add_test(tst_qtimezone +qt_internal_add_test(tst_qtimezone SOURCES tst_qtimezone.cpp DEFINES @@ -17,12 +17,12 @@ qt_add_test(tst_qtimezone ## Scopes: ##################################################################### -qt_extend_target(tst_qtimezone CONDITION QT_FEATURE_icu +qt_internal_extend_target(tst_qtimezone CONDITION QT_FEATURE_icu LIBRARIES ICU::i18n ICU::uc ICU::data ) -qt_extend_target(tst_qtimezone CONDITION APPLE +qt_internal_extend_target(tst_qtimezone CONDITION APPLE SOURCES tst_qtimezone_darwin.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt b/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt index 37c3a21d78..0b0d8e062a 100644 --- a/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt +++ b/tests/auto/corelib/tools/collections/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_collections Test: ##################################################################### -qt_add_test(tst_collections +qt_internal_add_test(tst_collections SOURCES tst_collections.cpp DEFINES diff --git a/tests/auto/corelib/tools/collections/CMakeLists.txt b/tests/auto/corelib/tools/collections/CMakeLists.txt index 4575d27d20..32ef8d7506 100644 --- a/tests/auto/corelib/tools/collections/CMakeLists.txt +++ b/tests/auto/corelib/tools/collections/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_collections Test: ##################################################################### -qt_add_test(tst_collections +qt_internal_add_test(tst_collections SOURCES tst_collections.cpp DEFINES diff --git a/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt b/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt index 8d160af9af..f640996a53 100644 --- a/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt +++ b/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_containerapisymmetry Test: ##################################################################### -qt_add_test(tst_containerapisymmetry +qt_internal_add_test(tst_containerapisymmetry SOURCES tst_containerapisymmetry.cpp ) diff --git a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt index 2ddc47b5c0..d793c81ce6 100644 --- a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt +++ b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qalgorithms Test: ##################################################################### -qt_add_test(tst_qalgorithms +qt_internal_add_test(tst_qalgorithms SOURCES tst_qalgorithms.cpp ) diff --git a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt index fac007f3b5..4a2f9d0d6a 100644 --- a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt +++ b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qarraydata Test: ##################################################################### -qt_add_test(tst_qarraydata +qt_internal_add_test(tst_qarraydata EXCEPTIONS SOURCES simplevector.h diff --git a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt index 439aa4af6c..37e7a873e8 100644 --- a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qbitarray Test: ##################################################################### -qt_add_test(tst_qbitarray +qt_internal_add_test(tst_qbitarray SOURCES tst_qbitarray.cpp ) diff --git a/tests/auto/corelib/tools/qcache/CMakeLists.txt b/tests/auto/corelib/tools/qcache/CMakeLists.txt index 509056c06b..5ed12a7973 100644 --- a/tests/auto/corelib/tools/qcache/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcache Test: ##################################################################### -qt_add_test(tst_qcache +qt_internal_add_test(tst_qcache SOURCES tst_qcache.cpp ) diff --git a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt index 75e9ebfc94..128b8cfd73 100644 --- a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcommandlineparser Test: ##################################################################### -qt_add_test(tst_qcommandlineparser +qt_internal_add_test(tst_qcommandlineparser SOURCES tst_qcommandlineparser.cpp ) diff --git a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt index 688c685ade..2068f988dd 100644 --- a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcommandlineparser_test_helper Binary: ##################################################################### -qt_add_executable(qcommandlineparser_test_helper +qt_internal_add_executable(qcommandlineparser_test_helper OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES qcommandlineparser_test_helper.cpp diff --git a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt index 7754954457..dc9722ccc7 100644 --- a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcontiguouscache Test: ##################################################################### -qt_add_test(tst_qcontiguouscache +qt_internal_add_test(tst_qcontiguouscache SOURCES tst_qcontiguouscache.cpp ) diff --git a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt index 4984606509..a4b3106856 100644 --- a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qcryptographichash +qt_internal_add_test(tst_qcryptographichash SOURCES tst_qcryptographichash.cpp TESTDATA ${test_data} @@ -26,7 +26,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "data/d41d8cd98f00b204e9800998ecf8427e.md5" ) - qt_add_resource(tst_qcryptographichash "testdata" + qt_internal_add_resource(tst_qcryptographichash "testdata" PREFIX "/" FILES diff --git a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt index f93bfe6b94..ce12cd9bfc 100644 --- a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt +++ b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qeasingcurve Test: ##################################################################### -qt_add_test(tst_qeasingcurve +qt_internal_add_test(tst_qeasingcurve SOURCES tst_qeasingcurve.cpp ) diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt index 9943f5200b..92850a8c4e 100644 --- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qexplicitlyshareddatapointer Test: ##################################################################### -qt_add_test(tst_qexplicitlyshareddatapointer +qt_internal_add_test(tst_qexplicitlyshareddatapointer SOURCES tst_qexplicitlyshareddatapointer.cpp ) diff --git a/tests/auto/corelib/tools/qflatmap/CMakeLists.txt b/tests/auto/corelib/tools/qflatmap/CMakeLists.txt index f5a5dfd5fc..5d79b16776 100644 --- a/tests/auto/corelib/tools/qflatmap/CMakeLists.txt +++ b/tests/auto/corelib/tools/qflatmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qflatmap Test: ##################################################################### -qt_add_test(tst_qflatmap +qt_internal_add_test(tst_qflatmap SOURCES tst_qflatmap.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qfreelist/CMakeLists.txt b/tests/auto/corelib/tools/qfreelist/CMakeLists.txt index 3940470240..cdac17e612 100644 --- a/tests/auto/corelib/tools/qfreelist/CMakeLists.txt +++ b/tests/auto/corelib/tools/qfreelist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfreelist Test: ##################################################################### -qt_add_test(tst_qfreelist +qt_internal_add_test(tst_qfreelist SOURCES tst_qfreelist.cpp PUBLIC_LIBRARIES @@ -14,7 +14,7 @@ qt_add_test(tst_qfreelist ## Scopes: ##################################################################### -qt_extend_target(tst_qfreelist CONDITION NOT QT_FEATURE_private_tests +qt_internal_extend_target(tst_qfreelist CONDITION NOT QT_FEATURE_private_tests SOURCES ${QT_SOURCE_TREE}/src/corelib/tools/qfreelist.cpp ) diff --git a/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt index cb0327c90f..0d41a6875e 100644 --- a/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt +++ b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhash Test: ##################################################################### -qt_add_test(tst_qhash +qt_internal_add_test(tst_qhash SOURCES tst_qhash.cpp DEFINES diff --git a/tests/auto/corelib/tools/qhash/CMakeLists.txt b/tests/auto/corelib/tools/qhash/CMakeLists.txt index 39b8e25e30..b01782aed5 100644 --- a/tests/auto/corelib/tools/qhash/CMakeLists.txt +++ b/tests/auto/corelib/tools/qhash/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhash Test: ##################################################################### -qt_add_test(tst_qhash +qt_internal_add_test(tst_qhash SOURCES tst_qhash.cpp DEFINES diff --git a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt index a91a7c02ef..86d4207d6e 100644 --- a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt +++ b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhashfunctions Test: ##################################################################### -qt_add_test(tst_qhashfunctions +qt_internal_add_test(tst_qhashfunctions SOURCES tst_qhashfunctions.cpp ) diff --git a/tests/auto/corelib/tools/qline/CMakeLists.txt b/tests/auto/corelib/tools/qline/CMakeLists.txt index 24de03c81a..49253ff06c 100644 --- a/tests/auto/corelib/tools/qline/CMakeLists.txt +++ b/tests/auto/corelib/tools/qline/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qline Test: ##################################################################### -qt_add_test(tst_qline +qt_internal_add_test(tst_qline SOURCES tst_qline.cpp ) @@ -12,7 +12,7 @@ qt_add_test(tst_qline ## Scopes: ##################################################################### -qt_extend_target(tst_qline CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS +qt_internal_extend_target(tst_qline CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS PUBLIC_LIBRARIES m ) diff --git a/tests/auto/corelib/tools/qlist/CMakeLists.txt b/tests/auto/corelib/tools/qlist/CMakeLists.txt index 6909d83967..89b92ab305 100644 --- a/tests/auto/corelib/tools/qlist/CMakeLists.txt +++ b/tests/auto/corelib/tools/qlist/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlist Test: ##################################################################### -qt_add_test(tst_qlist +qt_internal_add_test(tst_qlist SOURCES tst_qlist.cpp ) diff --git a/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt b/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt index e41a779029..e2f1ed45ea 100644 --- a/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmacautoreleasepool Test: ##################################################################### -qt_add_test(tst_qmacautoreleasepool +qt_internal_add_test(tst_qmacautoreleasepool SOURCES tst_qmacautoreleasepool.mm PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt index 1c38a99d99..fc5be609e1 100644 --- a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmakearray Test: ##################################################################### -qt_add_test(tst_qmakearray +qt_internal_add_test(tst_qmakearray SOURCES tst_qmakearray.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt index 4d1425251b..d96ed13596 100644 --- a/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt +++ b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmap Test: ##################################################################### -qt_add_test(tst_qmap +qt_internal_add_test(tst_qmap SOURCES tst_qmap.cpp DEFINES diff --git a/tests/auto/corelib/tools/qmap/CMakeLists.txt b/tests/auto/corelib/tools/qmap/CMakeLists.txt index 5de85b2fc2..c0a2cb79ab 100644 --- a/tests/auto/corelib/tools/qmap/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmap/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmap Test: ##################################################################### -qt_add_test(tst_qmap +qt_internal_add_test(tst_qmap SOURCES tst_qmap.cpp DEFINES diff --git a/tests/auto/corelib/tools/qmargins/CMakeLists.txt b/tests/auto/corelib/tools/qmargins/CMakeLists.txt index fa1530b32c..aa58ce03ab 100644 --- a/tests/auto/corelib/tools/qmargins/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmargins/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmargins Test: ##################################################################### -qt_add_test(tst_qmargins +qt_internal_add_test(tst_qmargins SOURCES tst_qmargins.cpp ) diff --git a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt index 75a6febf81..dcc86fe555 100644 --- a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmessageauthenticationcode Test: ##################################################################### -qt_add_test(tst_qmessageauthenticationcode +qt_internal_add_test(tst_qmessageauthenticationcode SOURCES tst_qmessageauthenticationcode.cpp ) diff --git a/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt b/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt index 1a10b0dc47..7584d580ec 100644 --- a/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qoffsetstringarray Test: ##################################################################### -qt_add_test(tst_qoffsetstringarray +qt_internal_add_test(tst_qoffsetstringarray SOURCES tst_qoffsetstringarray.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qpair/CMakeLists.txt b/tests/auto/corelib/tools/qpair/CMakeLists.txt index b02f4feb0b..3d0ba82e44 100644 --- a/tests/auto/corelib/tools/qpair/CMakeLists.txt +++ b/tests/auto/corelib/tools/qpair/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpair Test: ##################################################################### -qt_add_test(tst_qpair +qt_internal_add_test(tst_qpair SOURCES tst_qpair.cpp ) diff --git a/tests/auto/corelib/tools/qpoint/CMakeLists.txt b/tests/auto/corelib/tools/qpoint/CMakeLists.txt index 1667c0239c..ddc0733231 100644 --- a/tests/auto/corelib/tools/qpoint/CMakeLists.txt +++ b/tests/auto/corelib/tools/qpoint/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpoint Test: ##################################################################### -qt_add_test(tst_qpoint +qt_internal_add_test(tst_qpoint SOURCES tst_qpoint.cpp ) diff --git a/tests/auto/corelib/tools/qpointf/CMakeLists.txt b/tests/auto/corelib/tools/qpointf/CMakeLists.txt index e7d1f1b0ff..09f725f8e6 100644 --- a/tests/auto/corelib/tools/qpointf/CMakeLists.txt +++ b/tests/auto/corelib/tools/qpointf/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpointf Test: ##################################################################### -qt_add_test(tst_qpointf +qt_internal_add_test(tst_qpointf SOURCES tst_qpointf.cpp ) diff --git a/tests/auto/corelib/tools/qqueue/CMakeLists.txt b/tests/auto/corelib/tools/qqueue/CMakeLists.txt index fc0517b69f..c3528163eb 100644 --- a/tests/auto/corelib/tools/qqueue/CMakeLists.txt +++ b/tests/auto/corelib/tools/qqueue/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qqueue Test: ##################################################################### -qt_add_test(tst_qqueue +qt_internal_add_test(tst_qqueue SOURCES tst_qqueue.cpp ) diff --git a/tests/auto/corelib/tools/qrect/CMakeLists.txt b/tests/auto/corelib/tools/qrect/CMakeLists.txt index 5acc4522b6..d48bec0c7d 100644 --- a/tests/auto/corelib/tools/qrect/CMakeLists.txt +++ b/tests/auto/corelib/tools/qrect/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrect Test: ##################################################################### -qt_add_test(tst_qrect +qt_internal_add_test(tst_qrect SOURCES tst_qrect.cpp ) diff --git a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt index 029d032d5c..d5d633c0bd 100644 --- a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qringbuffer Test: ##################################################################### -qt_add_test(tst_qringbuffer +qt_internal_add_test(tst_qringbuffer SOURCES tst_qringbuffer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt index 8bc4b7e43b..df2d2aa509 100644 --- a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscopedpointer Test: ##################################################################### -qt_add_test(tst_qscopedpointer +qt_internal_add_test(tst_qscopedpointer SOURCES tst_qscopedpointer.cpp ) diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt index 653f0bc071..fa3e3e3024 100644 --- a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt +++ b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscopedvaluerollback Test: ##################################################################### -qt_add_test(tst_qscopedvaluerollback +qt_internal_add_test(tst_qscopedvaluerollback SOURCES tst_qscopedvaluerollback.cpp ) diff --git a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt index 79efcd4d86..d21df799ea 100644 --- a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt +++ b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qscopeguard Test: ##################################################################### -qt_add_test(tst_qscopeguard +qt_internal_add_test(tst_qscopeguard SOURCES tst_qscopeguard.cpp ) diff --git a/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt index 8e7312b739..acf423880d 100644 --- a/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt +++ b/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qset Test: ##################################################################### -qt_add_test(tst_qset +qt_internal_add_test(tst_qset SOURCES tst_qset.cpp DEFINES diff --git a/tests/auto/corelib/tools/qset/CMakeLists.txt b/tests/auto/corelib/tools/qset/CMakeLists.txt index 85845f76d2..ed92c1e036 100644 --- a/tests/auto/corelib/tools/qset/CMakeLists.txt +++ b/tests/auto/corelib/tools/qset/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qset Test: ##################################################################### -qt_add_test(tst_qset +qt_internal_add_test(tst_qset SOURCES tst_qset.cpp #DEFINES # special case remove diff --git a/tests/auto/corelib/tools/qsize/CMakeLists.txt b/tests/auto/corelib/tools/qsize/CMakeLists.txt index 1d3018f066..5ecd154cd3 100644 --- a/tests/auto/corelib/tools/qsize/CMakeLists.txt +++ b/tests/auto/corelib/tools/qsize/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsize Test: ##################################################################### -qt_add_test(tst_qsize +qt_internal_add_test(tst_qsize SOURCES tst_qsize.cpp ) diff --git a/tests/auto/corelib/tools/qsizef/CMakeLists.txt b/tests/auto/corelib/tools/qsizef/CMakeLists.txt index cb942e10ec..eb59fc6d8e 100644 --- a/tests/auto/corelib/tools/qsizef/CMakeLists.txt +++ b/tests/auto/corelib/tools/qsizef/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsizef Test: ##################################################################### -qt_add_test(tst_qsizef +qt_internal_add_test(tst_qsizef SOURCES tst_qsizef.cpp ) diff --git a/tests/auto/corelib/tools/qstl/CMakeLists.txt b/tests/auto/corelib/tools/qstl/CMakeLists.txt index 65af48f1a2..49b209cffa 100644 --- a/tests/auto/corelib/tools/qstl/CMakeLists.txt +++ b/tests/auto/corelib/tools/qstl/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstl Test: ##################################################################### -qt_add_test(tst_qstl +qt_internal_add_test(tst_qstl SOURCES tst_qstl.cpp ) diff --git a/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt b/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt index 1057e5ebe5..7f3ae75028 100644 --- a/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt +++ b/tests/auto/corelib/tools/qtaggedpointer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtaggedpointer Test: ##################################################################### -qt_add_test(tst_qtaggedpointer +qt_internal_add_test(tst_qtaggedpointer SOURCES tst_qtaggedpointer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt index abf76e4b73..de61529fd2 100644 --- a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt +++ b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtimeline Test: ##################################################################### -qt_add_test(tst_qtimeline +qt_internal_add_test(tst_qtimeline SOURCES tst_qtimeline.cpp ) diff --git a/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt b/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt index 63bb827ec1..bdc927d5b6 100644 --- a/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt +++ b/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvarlengtharray Test: ##################################################################### -qt_add_test(tst_qvarlengtharray +qt_internal_add_test(tst_qvarlengtharray SOURCES tst_qvarlengtharray.cpp ) diff --git a/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt b/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt index 893ea91413..2ab3703121 100644 --- a/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt +++ b/tests/auto/corelib/tools/qversionnumber/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qversionnumber Test: ##################################################################### -qt_add_test(tst_qversionnumber +qt_internal_add_test(tst_qversionnumber SOURCES tst_qversionnumber.cpp ) -- cgit v1.2.3