From 48c82e90af12da74c713665ddfd7f8d825ae5bdb Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 16 Jan 2020 10:42:05 +0100 Subject: Post Merge Fixes Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce Reviewed-by: Alexandru Croitor --- .../qmimedatabase-cache/.prev_CMakeLists.txt | 4 +-- .../qmimedatabase-xml/.prev_CMakeLists.txt | 4 +-- .../serialization/qdatastream/.prev_CMakeLists.txt | 35 ++++++++++++++++++ .../qdbusabstractinterface/.prev_CMakeLists.txt | 1 - .../qdbusmarshall/.prev_CMakeLists.txt | 1 - tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt | 1 + tests/auto/gui/text/qfontdatabase/CMakeLists.txt | 4 +++ .../network/ssl/qsslcertificate/CMakeLists.txt | 7 ++++ tests/auto/opengl/CMakeLists.txt | 5 --- tests/auto/opengl/qgl/CMakeLists.txt | 42 ---------------------- tests/auto/opengl/qglbuffer/CMakeLists.txt | 21 ----------- tests/auto/opengl/qglfunctions/CMakeLists.txt | 21 ----------- .../graphicsview/qgraphicsview/CMakeLists.txt | 8 +++++ .../widgets/widgets/qopenglwidget/CMakeLists.txt | 1 + tests/manual/CMakeLists.txt | 10 ++++-- tests/manual/qtabletevent/CMakeLists.txt | 2 +- 16 files changed, 68 insertions(+), 99 deletions(-) create mode 100644 tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt delete mode 100644 tests/auto/opengl/qgl/CMakeLists.txt delete mode 100644 tests/auto/opengl/qglbuffer/CMakeLists.txt delete mode 100644 tests/auto/opengl/qglfunctions/CMakeLists.txt (limited to 'tests') 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 ced7f27a19..9dc2ea18bf 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("/devel/qt5/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" +set_source_files_properties("/devel/work/qt-cmake/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 - "/devel/qt5/qtbase/src/corelib/mimetypes" + "/devel/work/qt-cmake/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 7f34b06fab..1672255d29 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("/devel/qt5/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" +set_source_files_properties("/devel/work/qt-cmake/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 - "/devel/qt5/qtbase/src/corelib/mimetypes" + "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes" FILES ${mimetypes_resource_files} ) diff --git a/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt new file mode 100644 index 0000000000..1402aed9ab --- /dev/null +++ b/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt @@ -0,0 +1,35 @@ +# Generated from qdatastream.pro. + +##################################################################### +## tst_qdatastream Test: +##################################################################### + +# Collect test data +list(APPEND test_data "datastream.q42") + +add_qt_test(tst_qdatastream + SOURCES + tst_qdatastream.cpp + DEFINES + -QT_NO_LINKED_LIST + PUBLIC_LIBRARIES + Qt::Gui + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +if(ANDROID AND NOT ANDROID_EMBEDDED) + # Resources: + set(testdata_resource_files + "datastream.q42" + ) + + add_qt_resource(tst_qdatastream "testdata" + PREFIX + "/" + FILES + ${testdata_resource_files} + ) +endif() diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt index 83d9899b36..ee5a7c4003 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt @@ -6,7 +6,6 @@ add_qt_test(tst_qdbusabstractinterface OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../interface.cpp ../interface.h ../tst_qdbusabstractinterface.cpp diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt index 6f8a6804e1..090f6e7fb6 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt @@ -6,7 +6,6 @@ add_qt_test(tst_qdbusmarshall OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../tst_qdbusmarshall.cpp LIBRARIES diff --git a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt index 1915f28a18..c8e3789886 100644 --- a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt +++ b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt @@ -12,4 +12,5 @@ add_qt_test(tst_qopenglwindow Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::OpenGL ) diff --git a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt index 641a2475f0..32affde1ca 100644 --- a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt +++ b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt @@ -28,10 +28,14 @@ set_source_files_properties("../../../shared/resources/testfont_condensed.ttf" set_source_files_properties("../../../shared/resources/testfont_italic.ttf" PROPERTIES QT_RESOURCE_ALIAS "testfont_italic.ttf" ) +set_source_files_properties("../../../shared/resources/testfont_open.otf" + PROPERTIES QT_RESOURCE_ALIAS "testfont_open.otf" +) set(testdata_resource_files "../../../shared/resources/testfont.ttf" "../../../shared/resources/testfont_condensed.ttf" "../../../shared/resources/testfont_italic.ttf" + "../../../shared/resources/testfont_open.otf" "LED_REAL.TTF" ) diff --git a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt index 1509c2e809..4b8fefc499 100644 --- a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt @@ -4,6 +4,13 @@ ## tst_qsslcertificate Test: ##################################################################### +# special case begin +# This test requires private tests to properly build +if (NOT QT_FEATURE_private_tests) + return() +endif() +# special case end + # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/tests/auto/opengl/CMakeLists.txt b/tests/auto/opengl/CMakeLists.txt index 54238c1fa6..7281d56838 100644 --- a/tests/auto/opengl/CMakeLists.txt +++ b/tests/auto/opengl/CMakeLists.txt @@ -1,6 +1 @@ # Generated from opengl.pro. - -add_subdirectory(qgl) -add_subdirectory(qglbuffer) -add_subdirectory(qglfunctions) -add_subdirectory(qglthreads) diff --git a/tests/auto/opengl/qgl/CMakeLists.txt b/tests/auto/opengl/qgl/CMakeLists.txt deleted file mode 100644 index 6af8834473..0000000000 --- a/tests/auto/opengl/qgl/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -# Generated from qgl.pro. - -if(NOT TARGET Qt::OpenGL) - return() -endif() - -##################################################################### -## tst_qgl Test: -##################################################################### - -add_qt_test(tst_qgl - SOURCES - tst_qgl.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::OpenGLPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::Widgets -) - -# Resources: -set_source_files_properties("../../gui/image/qpixmap/images/designer.png" - PROPERTIES QT_RESOURCE_ALIAS "designer.png" -) -set(qgl_resource_files - "../../gui/image/qpixmap/images/designer.png" -) - -add_qt_resource(tst_qgl "qgl" - PREFIX - "/" - FILES - ${qgl_resource_files} -) - - -#### Keys ignored in scope 1:.:.:qgl.pro:: -# _REQUIREMENTS = "qtHaveModule(opengl)" diff --git a/tests/auto/opengl/qglbuffer/CMakeLists.txt b/tests/auto/opengl/qglbuffer/CMakeLists.txt deleted file mode 100644 index f494115638..0000000000 --- a/tests/auto/opengl/qglbuffer/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Generated from qglbuffer.pro. - -if(NOT TARGET Qt::OpenGL) - return() -endif() - -##################################################################### -## tst_qglbuffer Test: -##################################################################### - -add_qt_test(tst_qglbuffer - SOURCES - tst_qglbuffer.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::Widgets -) - -#### Keys ignored in scope 1:.:.:qglbuffer.pro:: -# _REQUIREMENTS = "qtHaveModule(opengl)" diff --git a/tests/auto/opengl/qglfunctions/CMakeLists.txt b/tests/auto/opengl/qglfunctions/CMakeLists.txt deleted file mode 100644 index 8eb344a8d6..0000000000 --- a/tests/auto/opengl/qglfunctions/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Generated from qglfunctions.pro. - -if(NOT TARGET Qt::OpenGL) - return() -endif() - -##################################################################### -## tst_qglfunctions Test: -##################################################################### - -add_qt_test(tst_qglfunctions - SOURCES - tst_qglfunctions.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::Widgets -) - -#### Keys ignored in scope 1:.:.:qglfunctions.pro:: -# _REQUIREMENTS = "qtHaveModule(opengl)" diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt index 22354b9c5e..191cc9a9c0 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt @@ -22,3 +22,11 @@ add_qt_test(tst_qgraphicsview #### Keys ignored in scope 1:.:.:qgraphicsview.pro:: # testcase.timeout = "500" + +## Scopes: +##################################################################### + +extend_target(tst_qgraphicsview CONDITION QT_FEATURE_opengl + PUBLIC_LIBRARIES + Qt::OpenGL +) diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 01f44ef78e..37088f8495 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -12,5 +12,6 @@ add_qt_test(tst_qopenglwidget Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::OpenGL Qt::Widgets ) diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 9d5a3effaa..34476f7ee7 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -9,13 +9,17 @@ endif() add_subdirectory(bearerex) add_subdirectory(filetest) -add_subdirectory(embeddedintoforeignwindow) -add_subdirectory(foreignwindows) +# special case begin +# diaglib is broken in dev due to missing +# QtOpenGL/QGLFunctions headers +# add_subdirectory(embeddedintoforeignwindow) +# add_subdirectory(foreignwindows) +# special case end add_subdirectory(gestures) add_subdirectory(highdpi) add_subdirectory(inputmethodhints) add_subdirectory(keypadnavigation) -add_subdirectory(lance) +#add_subdirectory(lance) # special case qgl.h missing add_subdirectory(qcursor) add_subdirectory(qdesktopservices) add_subdirectory(qdesktopwidget) diff --git a/tests/manual/qtabletevent/CMakeLists.txt b/tests/manual/qtabletevent/CMakeLists.txt index 06a0bab2d8..422664e2a4 100644 --- a/tests/manual/qtabletevent/CMakeLists.txt +++ b/tests/manual/qtabletevent/CMakeLists.txt @@ -1,5 +1,5 @@ # Generated from qtabletevent.pro. -add_subdirectory(device_information) +#add_subdirectory(device_information) # special case no member named 'staticQtMetaObject' add_subdirectory(event_compression) add_subdirectory(regular_widgets) -- cgit v1.2.3