diff options
Diffstat (limited to 'tests/auto')
18 files changed, 45 insertions, 30 deletions
diff --git a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt index 5a4bd8cf35..62b0308851 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt @@ -9,7 +9,6 @@ add_qt_test(tst_qtconcurrentfilter tst_qtconcurrentfilter.cpp DEFINES -QT_NO_LINKED_LIST - QT_STRICT_ITERATORS PUBLIC_LIBRARIES Qt::Concurrent ) diff --git a/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt index 2e53c4cfc5..be51bf09bd 100644 --- a/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt @@ -9,7 +9,6 @@ add_qt_test(tst_qtconcurrentmap tst_qtconcurrentmap.cpp DEFINES -QT_NO_LINKED_LIST - QT_STRICT_ITERATORS PUBLIC_LIBRARIES Qt::Concurrent ) diff --git a/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt index 99cc7f6ae0..27b376a406 100644 --- a/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt @@ -7,8 +7,6 @@ add_qt_test(tst_qtconcurrentmedian SOURCES tst_qtconcurrentmedian.cpp - DEFINES - QT_STRICT_ITERATORS PUBLIC_LIBRARIES Qt::Concurrent ) diff --git a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt index 7b5c5bab8c..b976754629 100644 --- a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt @@ -18,7 +18,6 @@ list(APPEND test_data "forRenaming.txt") list(APPEND test_data "resources/file1.ext1") add_qt_test(tst_qfile - GUI SOURCES ../../../../shared/emulationdetector.h tst_qfile.cpp diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt index 70c471858c..03b648d76f 100644 --- a/tests/auto/corelib/io/qfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/CMakeLists.txt @@ -18,7 +18,6 @@ list(APPEND test_data "forRenaming.txt") list(APPEND test_data "resources/file1.ext1") add_qt_test(tst_qfile - GUI SOURCES ../../../../shared/emulationdetector.h tst_qfile.cpp diff --git a/tests/auto/corelib/io/qlockfile/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/CMakeLists.txt index 5ab39c57a2..52bd7bfd8f 100644 --- a/tests/auto/corelib/io/qlockfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qlockfile/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qlockfile - GUI SOURCES tst_qlockfile.cpp 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 d109c3a1e6..ced7f27a19 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt @@ -17,7 +17,7 @@ add_qt_test(tst_qmimedatabase-cache ) # Resources: -set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" +set_source_files_properties("/devel/qt5/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" ) set(mimetypes_resource_files @@ -28,7 +28,7 @@ add_qt_resource(tst_qmimedatabase-cache "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE - "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes" + "/devel/qt5/qtbase/src/corelib/mimetypes" FILES ${mimetypes_resource_files} ) 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 009defff8a..7f34b06fab 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt @@ -17,7 +17,7 @@ add_qt_test(tst_qmimedatabase-xml ) # Resources: -set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" +set_source_files_properties("/devel/qt5/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" ) set(mimetypes_resource_files @@ -28,7 +28,7 @@ add_qt_resource(tst_qmimedatabase-xml "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE - "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes" + "/devel/qt5/qtbase/src/corelib/mimetypes" FILES ${mimetypes_resource_files} ) diff --git a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt index 0cfea773b1..14b7a73e6f 100644 --- a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt @@ -9,7 +9,6 @@ add_qt_test(tst_qfuture tst_qfuture.cpp DEFINES -QT_NO_JAVA_STYLE_ITERATORS - QT_STRICT_ITERATORS LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt index 7fa65a6859..de295bc129 100644 --- a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt +++ b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt @@ -7,8 +7,6 @@ add_qt_test(tst_qresultstore SOURCES tst_qresultstore.cpp - DEFINES - QT_STRICT_ITERATORS LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt new file mode 100644 index 0000000000..87ae29a04c --- /dev/null +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from crashonexit.pro. + +##################################################################### +## crashonexit Binary: +##################################################################### + +add_qt_executable(crashonexit + OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit" + INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit" + SOURCES + crashOnExit.cpp +) + +## Scopes: +##################################################################### diff --git a/tests/auto/corelib/tools/CMakeLists.txt b/tests/auto/corelib/tools/CMakeLists.txt index 17588e3daa..534bd7928a 100644 --- a/tests/auto/corelib/tools/CMakeLists.txt +++ b/tests/auto/corelib/tools/CMakeLists.txt @@ -18,7 +18,7 @@ add_subdirectory(qhash) add_subdirectory(qhashfunctions) # add_subdirectory(qline) # special case not ported add_subdirectory(qlinkedlist) -add_subdirectory(qlist) +# add_subdirectory(qlist) # special case no longer exists # add_subdirectory(qlist_strictiterators) # special case not ported add_subdirectory(qmakearray) add_subdirectory(qmap) diff --git a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt index f4a38ed52d..2fc50a7d89 100644 --- a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt @@ -1,3 +1,11 @@ -add_subdirectory(testhelper) +# Generated from qcommandlineparser.pro. + +##################################################################### +## tst_qcommandlineparser Test: +##################################################################### -add_qt_test(tst_qcommandlineparser SOURCES tst_qcommandlineparser.cpp) +add_qt_test(tst_qcommandlineparser + SOURCES + tst_qcommandlineparser.cpp +) +add_subdirectory(testhelper) diff --git a/tests/auto/corelib/tools/qlist/CMakeLists.txt b/tests/auto/corelib/tools/qlist/CMakeLists.txt deleted file mode 100644 index 4ad62f2599..0000000000 --- a/tests/auto/corelib/tools/qlist/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Generated from qlist.pro. - -##################################################################### -## tst_qlist Test: -##################################################################### - -add_qt_test(tst_qlist - SOURCES - tst_qlist.cpp -) - -## Scopes: -##################################################################### diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt index 08bfb51234..a97accb925 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt @@ -1,3 +1,4 @@ + # Generated from qdbusabstractadaptor.pro. add_subdirectory(qmyserver) @@ -10,3 +11,4 @@ add_qt_test(tst_qdbusabstractadaptor Qt::CorePrivate Qt::DBus ) + diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt new file mode 100644 index 0000000000..d79bfa0c2d --- /dev/null +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from qdbusabstractinterface.pro. + +##################################################################### +## tst_qdbusabstractinterface Test: +##################################################################### + +# special case begin +# this test can not be generated here. It needs to be set up in the +# parent directory +# special case end diff --git a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt index 3379fafcb0..02c52ed42d 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt @@ -8,6 +8,7 @@ add_qt_test(tst_qabstractitemview SOURCES tst_qabstractitemview.cpp LIBRARIES + Qt::GuiPrivate Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt index ce1e55e519..c00064446b 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt @@ -7,6 +7,8 @@ add_qt_test(tst_qabstractbutton SOURCES tst_qabstractbutton.cpp + LIBRARIES + Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Widgets |