diff options
Diffstat (limited to 'tests/auto/gui/text')
23 files changed, 40 insertions, 65 deletions
diff --git a/tests/auto/gui/text/qcssparser/CMakeLists.txt b/tests/auto/gui/text/qcssparser/CMakeLists.txt index 869eebbf95..09e1672bc4 100644 --- a/tests/auto/gui/text/qcssparser/CMakeLists.txt +++ b/tests/auto/gui/text/qcssparser/CMakeLists.txt @@ -16,10 +16,9 @@ add_qt_test(tst_qcssparser tst_qcssparser.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Xml TESTDATA ${test_data} ) diff --git a/tests/auto/gui/text/qfont/CMakeLists.txt b/tests/auto/gui/text/qfont/CMakeLists.txt index 1f063ab8b2..a04f8365b1 100644 --- a/tests/auto/gui/text/qfont/CMakeLists.txt +++ b/tests/auto/gui/text/qfont/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qfont SOURCES tst_qfont.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/auto/gui/text/qfontcache/CMakeLists.txt b/tests/auto/gui/text/qfontcache/CMakeLists.txt index dc5e76c91d..84f6373328 100644 --- a/tests/auto/gui/text/qfontcache/CMakeLists.txt +++ b/tests/auto/gui/text/qfontcache/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qfontcache SOURCES tst_qfontcache.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt index 32affde1ca..65c6224a00 100644 --- a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt +++ b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt @@ -10,11 +10,10 @@ list(APPEND test_data "LED_REAL.TTF") add_qt_test(tst_qfontdatabase SOURCES tst_qfontdatabase.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt index 10ba5dd791..029f5d5ce3 100644 --- a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt +++ b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qfontmetrics SOURCES tst_qfontmetrics.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt index 8c379bffc3..e544fb313c 100644 --- a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt +++ b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qinputcontrol SOURCES tst_qinputcontrol.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qrawfont/CMakeLists.txt b/tests/auto/gui/text/qrawfont/CMakeLists.txt index 41093ee603..5044866c49 100644 --- a/tests/auto/gui/text/qrawfont/CMakeLists.txt +++ b/tests/auto/gui/text/qrawfont/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qrawfont SOURCES tst_qrawfont.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/auto/gui/text/qstatictext/CMakeLists.txt b/tests/auto/gui/text/qstatictext/CMakeLists.txt index c2b53e731c..80eef2f254 100644 --- a/tests/auto/gui/text/qstatictext/CMakeLists.txt +++ b/tests/auto/gui/text/qstatictext/CMakeLists.txt @@ -15,10 +15,7 @@ add_qt_test(tst_qstatictext ##################################################################### extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui ) diff --git a/tests/auto/gui/text/qtextblock/CMakeLists.txt b/tests/auto/gui/text/qtextblock/CMakeLists.txt index ca461a37d5..18e0be18c6 100644 --- a/tests/auto/gui/text/qtextblock/CMakeLists.txt +++ b/tests/auto/gui/text/qtextblock/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextblock SOURCES tst_qtextblock.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextcursor/CMakeLists.txt b/tests/auto/gui/text/qtextcursor/CMakeLists.txt index 2e129d0262..78b6ed191d 100644 --- a/tests/auto/gui/text/qtextcursor/CMakeLists.txt +++ b/tests/auto/gui/text/qtextcursor/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextcursor SOURCES tst_qtextcursor.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextdocument/CMakeLists.txt b/tests/auto/gui/text/qtextdocument/CMakeLists.txt index 5ac40ee8b6..7ea22d3fb0 100644 --- a/tests/auto/gui/text/qtextdocument/CMakeLists.txt +++ b/tests/auto/gui/text/qtextdocument/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_test(tst_qtextdocument SOURCES common.h tst_qtextdocument.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Xml ) diff --git a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt index 09469b7c7f..f92a82a262 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt +++ b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextdocumentfragment SOURCES tst_qtextdocumentfragment.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextformat/CMakeLists.txt b/tests/auto/gui/text/qtextformat/CMakeLists.txt index 5635141476..be7653abd4 100644 --- a/tests/auto/gui/text/qtextformat/CMakeLists.txt +++ b/tests/auto/gui/text/qtextformat/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextformat SOURCES tst_qtextformat.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextlayout/CMakeLists.txt b/tests/auto/gui/text/qtextlayout/CMakeLists.txt index b43c009b99..c87d5bdd4d 100644 --- a/tests/auto/gui/text/qtextlayout/CMakeLists.txt +++ b/tests/auto/gui/text/qtextlayout/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextlayout SOURCES tst_qtextlayout.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextlist/CMakeLists.txt b/tests/auto/gui/text/qtextlist/CMakeLists.txt index 80e4623ce5..f22de38a8c 100644 --- a/tests/auto/gui/text/qtextlist/CMakeLists.txt +++ b/tests/auto/gui/text/qtextlist/CMakeLists.txt @@ -8,9 +8,8 @@ add_qt_test(tst_qtextlist SOURCES ../qtextdocument/common.h tst_qtextlist.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt index 4e1f54a117..6a1043c89f 100644 --- a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt +++ b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt @@ -13,10 +13,9 @@ add_qt_test(tst_qtextmarkdownimporter tst_qtextmarkdownimporter.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt index c7695bff97..7360b40994 100644 --- a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt +++ b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt @@ -13,10 +13,9 @@ add_qt_test(tst_qtextmarkdownwriter tst_qtextmarkdownwriter.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt index f21648cfc7..18c84e5a45 100644 --- a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt +++ b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt @@ -9,9 +9,8 @@ add_qt_test(tst_qtextodfwriter tst_qtextodfwriter.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt index a1caa47e4e..5fb8db5405 100644 --- a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt +++ b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt @@ -15,11 +15,10 @@ add_qt_test(tst_qtextpiecetable SOURCES ../qtextdocument/common.h tst_qtextpiecetable.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:qtextpiecetable.pro:<TRUE>: diff --git a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt index 1a3b8cfa92..8d94e33b6c 100644 --- a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt +++ b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextscriptengine SOURCES tst_qtextscriptengine.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt index bdda60149c..b2434569d4 100644 --- a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt +++ b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt @@ -11,8 +11,7 @@ add_qt_executable(generate INCLUDE_DIRECTORIES . /usr/include/freetype2 - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui ) diff --git a/tests/auto/gui/text/qtexttable/CMakeLists.txt b/tests/auto/gui/text/qtexttable/CMakeLists.txt index 219a868953..de82c94233 100644 --- a/tests/auto/gui/text/qtexttable/CMakeLists.txt +++ b/tests/auto/gui/text/qtexttable/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qtexttable SOURCES tst_qtexttable.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) ## Scopes: diff --git a/tests/auto/gui/text/qzip/CMakeLists.txt b/tests/auto/gui/text/qzip/CMakeLists.txt index 034e52e1fd..dfeb968cc1 100644 --- a/tests/auto/gui/text/qzip/CMakeLists.txt +++ b/tests/auto/gui/text/qzip/CMakeLists.txt @@ -10,10 +10,9 @@ list(APPEND test_data "testdata") add_qt_test(tst_qzip SOURCES tst_qzip.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate TESTDATA ${test_data} ) |