Regenerate projects one last time before merge

Change-Id: Ia24cf56b79ca6dacd370a7e397024e9b663e0167
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-02-12 10:24:49 +01:00
parent 36089f5e77
commit 0d177053b9
303 changed files with 482 additions and 792 deletions

View File

@ -18,14 +18,11 @@ add_qt_gui_executable(hellowindow
hellowindow.cpp hellowindow.h hellowindow.cpp hellowindow.h
main.cpp main.cpp
) )
target_link_libraries(hellowindow PRIVATE
Qt::CorePrivate
Qt::GuiPrivate
)
target_link_libraries(hellowindow PUBLIC target_link_libraries(hellowindow PUBLIC
Qt::Core Qt::Core
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )
install(TARGETS hellowindow install(TARGETS hellowindow

View File

@ -18,14 +18,11 @@ add_executable(windows
main.cpp main.cpp
window.cpp window.h window.cpp window.h
) )
target_link_libraries(windows PRIVATE
Qt::CorePrivate
Qt::GuiPrivate
)
target_link_libraries(windows PUBLIC target_link_libraries(windows PUBLIC
Qt::Core Qt::Core
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )
install(TARGETS windows install(TARGETS windows

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qpauseanimation add_qt_test(tst_qpauseanimation
SOURCES SOURCES
tst_qpauseanimation.cpp tst_qpauseanimation.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -10,6 +10,6 @@ add_qt_test(tst_qglobalstatic
tst_qglobalstatic.cpp tst_qglobalstatic.cpp
DEFINES DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qhooks add_qt_test(tst_qhooks
SOURCES SOURCES
tst_qhooks.cpp tst_qhooks.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,7 +7,7 @@
add_qt_test(tst_qnumeric add_qt_test(tst_qnumeric
SOURCES SOURCES
tst_qnumeric.cpp tst_qnumeric.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qrandomgenerator add_qt_test(tst_qrandomgenerator
SOURCES SOURCES
tst_qrandomgenerator.cpp tst_qrandomgenerator.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qtendian add_qt_test(tst_qtendian
SOURCES SOURCES
tst_qtendian.cpp tst_qtendian.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,7 +7,7 @@
add_qt_test(tst_qabstractfileengine add_qt_test(tst_qabstractfileengine
SOURCES SOURCES
tst_qabstractfileengine.cpp tst_qabstractfileengine.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qdataurl add_qt_test(tst_qdataurl
SOURCES SOURCES
tst_qdataurl.cpp tst_qdataurl.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -16,7 +16,7 @@ list(APPEND test_data "tst_qdir.cpp")
add_qt_test(tst_qdir add_qt_test(tst_qdir
SOURCES SOURCES
tst_qdir.cpp tst_qdir.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -10,7 +10,7 @@ list(APPEND test_data "entrylist")
add_qt_test(tst_qdiriterator add_qt_test(tst_qdiriterator
SOURCES SOURCES
tst_qdiriterator.cpp tst_qdiriterator.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -7,7 +7,7 @@
add_qt_test(tst_qfileinfo add_qt_test(tst_qfileinfo
SOURCES SOURCES
tst_qfileinfo.cpp tst_qfileinfo.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -8,6 +8,6 @@ add_qt_test(tst_qfilesystementry
SOURCES SOURCES
${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h
tst_qfilesystementry.cpp tst_qfilesystementry.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qfilesystemmetadata add_qt_test(tst_qfilesystemmetadata
SOURCES SOURCES
tst_qfilesystemmetadata.cpp tst_qfilesystemmetadata.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qipaddress add_qt_test(tst_qipaddress
SOURCES SOURCES
tst_qipaddress.cpp tst_qipaddress.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,7 +7,7 @@
add_qt_test(tst_qloggingcategory add_qt_test(tst_qloggingcategory
SOURCES SOURCES
tst_qloggingcategory.cpp tst_qloggingcategory.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -10,7 +10,7 @@ list(APPEND test_data "qtlogging.ini")
add_qt_test(tst_qloggingregistry add_qt_test(tst_qloggingregistry
SOURCES SOURCES
tst_qloggingregistry.cpp tst_qloggingregistry.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -11,9 +11,8 @@ add_qt_test(tst_qsettings
QT_DISABLE_DEPRECATED_BEFORE=0 QT_DISABLE_DEPRECATED_BEFORE=0
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../kernel/qmetatype ../../kernel/qmetatype
LIBRARIES
Qt::CorePrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qstorageinfo add_qt_test(tst_qstorageinfo
SOURCES SOURCES
tst_qstorageinfo.cpp tst_qstorageinfo.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -10,6 +10,6 @@ add_qt_test(tst_qtemporarydir
tst_qtemporarydir.cpp tst_qtemporarydir.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../../shared ../../../../shared
LIBRARIES PUBLIC_LIBRARIES
Qt::TestPrivate Qt::TestPrivate
) )

View File

@ -10,7 +10,7 @@ list(APPEND test_data "tst_qtemporaryfile.cpp")
add_qt_test(tst_qtemporaryfile add_qt_test(tst_qtemporaryfile
SOURCES SOURCES
tst_qtemporaryfile.cpp tst_qtemporaryfile.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::TestPrivate Qt::TestPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -12,7 +12,7 @@ add_qt_test(tst_qurlinternal
SOURCES SOURCES
../../codecs/utf8/utf8data.cpp ../../codecs/utf8/utf8data.cpp
tst_qurlinternal.cpp tst_qurlinternal.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -9,6 +9,6 @@ add_qt_test(tst_qurlquery
tst_qurlquery.cpp tst_qurlquery.cpp
DEFINES DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qeventloop add_qt_test(tst_qeventloop
SOURCES SOURCES
tst_qeventloop.cpp tst_qeventloop.cpp
LIBRARIES
Qt::CorePrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Network Qt::Network
) )

View File

@ -7,7 +7,7 @@
add_qt_test(tst_qmetaobject add_qt_test(tst_qmetaobject
SOURCES SOURCES
tst_qmetaobject.cpp tst_qmetaobject.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qmetaobjectbuilder add_qt_test(tst_qmetaobjectbuilder
SOURCES SOURCES
tst_qmetaobjectbuilder.cpp tst_qmetaobjectbuilder.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -15,7 +15,7 @@ add_qt_test(tst_qmetatype
QT_DISABLE_DEPRECATED_BEFORE=0 QT_DISABLE_DEPRECATED_BEFORE=0
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../other/qvariant_common ../../../other/qvariant_common
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -15,7 +15,7 @@ add_qt_test(tst_qmetatype
QT_DISABLE_DEPRECATED_BEFORE=0 QT_DISABLE_DEPRECATED_BEFORE=0
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../other/qvariant_common ../../../other/qvariant_common
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -13,11 +13,10 @@ add_qt_test(tst_qsocketnotifier
tst_qsocketnotifier.cpp tst_qsocketnotifier.cpp
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
${QT_SOURCE_TREE}/src/network ${QT_SOURCE_TREE}/src/network
LIBRARIES
Qt::CorePrivate
Qt::NetworkPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Network Qt::Network
Qt::NetworkPrivate
) )
#### Keys ignored in scope 1:.:.:qsocketnotifier.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qsocketnotifier.pro:<TRUE>:

View File

@ -7,7 +7,7 @@
add_qt_test(tst_qtimer add_qt_test(tst_qtimer
SOURCES SOURCES
tst_qtimer.cpp tst_qtimer.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -12,7 +12,7 @@ add_qt_test(tst_qvariant
QT_DISABLE_DEPRECATED_BEFORE=0 QT_DISABLE_DEPRECATED_BEFORE=0
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../other/qvariant_common ../../../other/qvariant_common
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -12,7 +12,7 @@ add_qt_test(tst_qvariant
QT_DISABLE_DEPRECATED_BEFORE=0 QT_DISABLE_DEPRECATED_BEFORE=0
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../other/qvariant_common ../../../other/qvariant_common
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qwineventnotifier add_qt_test(tst_qwineventnotifier
SOURCES SOURCES
tst_qwineventnotifier.cpp tst_qwineventnotifier.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qmimetype add_qt_test(tst_qmimetype
SOURCES SOURCES
tst_qmimetype.cpp tst_qmimetype.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -10,7 +10,7 @@ add_qt_test(tst_qfactoryloader
../plugin1/plugininterface1.h ../plugin1/plugininterface1.h
../plugin2/plugininterface2.h ../plugin2/plugininterface2.h
../tst_qfactoryloader.cpp ../tst_qfactoryloader.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -10,7 +10,7 @@ add_qt_test(tst_qfactoryloader
../plugin1/plugininterface1.h ../plugin1/plugininterface1.h
../plugin2/plugininterface2.h ../plugin2/plugininterface2.h
../tst_qfactoryloader.cpp ../tst_qfactoryloader.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -23,10 +23,8 @@ add_qt_test(tst_qpluginloader
##################################################################### #####################################################################
extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
LIBRARIES
Qt::CorePrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::CorePrivate
) )
extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release

View File

@ -7,7 +7,7 @@
add_qt_test(tst_json add_qt_test(tst_json
SOURCES SOURCES
tst_qtjson.cpp tst_qtjson.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qbytedatabuffer add_qt_test(tst_qbytedatabuffer
SOURCES SOURCES
tst_qbytedatabuffer.cpp tst_qbytedatabuffer.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qstringiterator add_qt_test(tst_qstringiterator
SOURCES SOURCES
tst_qstringiterator.cpp tst_qstringiterator.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -9,6 +9,6 @@ add_qt_test(tst_qfuture
tst_qfuture.cpp tst_qfuture.cpp
DEFINES DEFINES
-QT_NO_JAVA_STYLE_ITERATORS -QT_NO_JAVA_STYLE_ITERATORS
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -10,6 +10,6 @@ add_qt_test(tst_qfuture
DEFINES DEFINES
# -QT_NO_JAVA_STYLE_ITERATORS # special case # -QT_NO_JAVA_STYLE_ITERATORS # special case
QT_STRICT_ITERATORS QT_STRICT_ITERATORS
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,8 +7,7 @@
add_qt_test(tst_qfuturewatcher add_qt_test(tst_qfuturewatcher
SOURCES SOURCES
tst_qfuturewatcher.cpp tst_qfuturewatcher.cpp
LIBRARIES
Qt::CorePrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Concurrent Qt::Concurrent
Qt::CorePrivate
) )

View File

@ -13,8 +13,6 @@ add_qt_test(tst_qmutex
##################################################################### #####################################################################
extend_target(tst_qmutex CONDITION WIN32 extend_target(tst_qmutex CONDITION WIN32
LIBRARIES
Qt::CorePrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Core Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qresultstore add_qt_test(tst_qresultstore
SOURCES SOURCES
tst_qresultstore.cpp tst_qresultstore.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qdate add_qt_test(tst_qdate
SOURCES SOURCES
tst_qdate.cpp tst_qdate.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,7 +7,7 @@
add_qt_test(tst_qdatetime add_qt_test(tst_qdatetime
SOURCES SOURCES
tst_qdatetime.cpp tst_qdatetime.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,7 +7,7 @@
add_qt_test(tst_qtimezone add_qt_test(tst_qtimezone
SOURCES SOURCES
tst_qtimezone.cpp tst_qtimezone.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qmakearray add_qt_test(tst_qmakearray
SOURCES SOURCES
tst_qmakearray.cpp tst_qmakearray.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -7,6 +7,6 @@
add_qt_test(tst_qringbuffer add_qt_test(tst_qringbuffer
SOURCES SOURCES
tst_qringbuffer.cpp tst_qringbuffer.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
) )

View File

@ -8,11 +8,9 @@ add_qt_test(tst_qdbusmarshall
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES SOURCES
../tst_qdbusmarshall.cpp ../tst_qdbusmarshall.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::DBusPrivate Qt::DBusPrivate
PUBLIC_LIBRARIES
Qt::DBus
) )
## Scopes: ## Scopes:

View File

@ -8,11 +8,9 @@ add_qt_test(tst_qdbusmarshall
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES SOURCES
../tst_qdbusmarshall.cpp ../tst_qdbusmarshall.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::DBusPrivate Qt::DBusPrivate
PUBLIC_LIBRARIES
Qt::DBus
) )
## Scopes: ## Scopes:

View File

@ -7,8 +7,6 @@
add_qt_test(tst_qdbusmetaobject add_qt_test(tst_qdbusmetaobject
SOURCES SOURCES
tst_qdbusmetaobject.cpp tst_qdbusmetaobject.cpp
LIBRARIES
Qt::DBusPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::DBus Qt::DBusPrivate
) )

View File

@ -7,11 +7,9 @@
add_qt_test(tst_qdbustype add_qt_test(tst_qdbustype
SOURCES SOURCES
tst_qdbustype.cpp tst_qdbustype.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::DBusPrivate Qt::DBusPrivate
PUBLIC_LIBRARIES
Qt::DBus
) )
## Scopes: ## Scopes:

View File

@ -7,10 +7,8 @@
add_qt_test(tst_qdbusxmlparser add_qt_test(tst_qdbusxmlparser
SOURCES SOURCES
tst_qdbusxmlparser.cpp tst_qdbusxmlparser.cpp
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::DBusPrivate Qt::DBusPrivate
PUBLIC_LIBRARIES
Qt::DBus
Qt::Xml Qt::Xml
) )

View File

@ -13,11 +13,10 @@ list(APPEND test_data ${test_data_glob})
add_qt_test(tst_qimage add_qt_test(tst_qimage
SOURCES SOURCES
tst_qimage.cpp tst_qimage.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -17,11 +17,10 @@ list(APPEND test_data ${test_data_glob})
add_qt_test(tst_qimagereader add_qt_test(tst_qimagereader
SOURCES SOURCES
tst_qimagereader.cpp tst_qimagereader.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
Qt::Network Qt::Network
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -25,11 +25,10 @@ list(APPEND test_data ${test_data_glob})
add_qt_test(tst_qpixmap add_qt_test(tst_qpixmap
SOURCES SOURCES
tst_qpixmap.cpp tst_qpixmap.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )
@ -96,10 +95,9 @@ add_qt_resource(tst_qpixmap "qpixmap"
##################################################################### #####################################################################
extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets
LIBRARIES
Qt::WidgetsPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Widgets Qt::Widgets
Qt::WidgetsPrivate
) )
extend_target(tst_qpixmap CONDITION WIN32 AND NOT WINRT extend_target(tst_qpixmap CONDITION WIN32 AND NOT WINRT

View File

@ -7,8 +7,7 @@
add_qt_test(tst_qpixmapcache add_qt_test(tst_qpixmapcache
SOURCES SOURCES
tst_qpixmapcache.cpp tst_qpixmapcache.cpp
LIBRARIES
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -7,11 +7,10 @@
add_qt_test(tst_noqteventloop add_qt_test(tst_noqteventloop
SOURCES SOURCES
tst_noqteventloop.cpp tst_noqteventloop.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
Qt::Network Qt::Network
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qbackingstore add_qt_test(tst_qbackingstore
SOURCES SOURCES
tst_qbackingstore.cpp tst_qbackingstore.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -16,11 +16,9 @@ add_qt_test(tst_qguiapplication
QT_DISABLE_DEPRECATED_BEFORE=0x050E00 QT_DISABLE_DEPRECATED_BEFORE=0x050E00
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../corelib/kernel/qcoreapplication ../../../corelib/kernel/qcoreapplication
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
) )
# Resources: # Resources:

View File

@ -16,11 +16,9 @@ add_qt_test(tst_qguiapplication
QT_DISABLE_DEPRECATED_BEFORE=0x050E00 QT_DISABLE_DEPRECATED_BEFORE=0x050E00
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../../../corelib/kernel/qcoreapplication ../../../corelib/kernel/qcoreapplication
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
Threads::Threads # special case Threads::Threads # special case
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qguieventloop add_qt_test(tst_qguieventloop
SOURCES SOURCES
../../../corelib/kernel/qeventloop/tst_qeventloop.cpp ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp
LIBRARIES
Qt::CorePrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::Network Qt::Network
) )

View File

@ -7,8 +7,7 @@
add_qt_test(tst_qguitimer add_qt_test(tst_qguitimer
SOURCES SOURCES
../../../corelib/kernel/qtimer/tst_qtimer.cpp ../../../corelib/kernel/qtimer/tst_qtimer.cpp
LIBRARIES
Qt::CorePrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qguitimer add_qt_test(tst_qguitimer
SOURCES SOURCES
../../../corelib/kernel/qtimer/tst_qtimer.cpp ../../../corelib/kernel/qtimer/tst_qtimer.cpp
LIBRARIES
Qt::CorePrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Threads::Threads # special case Threads::Threads # special case
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qinputmethod add_qt_test(tst_qinputmethod
SOURCES SOURCES
tst_qinputmethod.cpp tst_qinputmethod.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -7,11 +7,10 @@
add_qt_test(tst_qkeysequence add_qt_test(tst_qkeysequence
SOURCES SOURCES
tst_qkeysequence.cpp tst_qkeysequence.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )
# Resources: # Resources:

View File

@ -7,10 +7,9 @@
add_qt_test(tst_qopenglwindow add_qt_test(tst_qopenglwindow
SOURCES SOURCES
tst_qopenglwindow.cpp tst_qopenglwindow.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
Qt::OpenGL Qt::OpenGL
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qrasterwindow add_qt_test(tst_qrasterwindow
SOURCES SOURCES
tst_qrasterwindow.cpp tst_qrasterwindow.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qscreen add_qt_test(tst_qscreen
SOURCES SOURCES
tst_qscreen.cpp tst_qscreen.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qsurfaceformat add_qt_test(tst_qsurfaceformat
SOURCES SOURCES
tst_qsurfaceformat.cpp tst_qsurfaceformat.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qtouchevent add_qt_test(tst_qtouchevent
SOURCES SOURCES
tst_qtouchevent.cpp tst_qtouchevent.cpp
LIBRARIES
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::GuiPrivate
Qt::Widgets Qt::Widgets
) )

View File

@ -7,11 +7,10 @@
add_qt_test(tst_qwindow add_qt_test(tst_qwindow
SOURCES SOURCES
tst_qwindow.cpp tst_qwindow.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )
## Scopes: ## Scopes:

View File

@ -7,11 +7,10 @@
add_qt_test(tst_qopengl add_qt_test(tst_qopengl
SOURCES SOURCES
tst_qopengl.cpp tst_qopengl.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
Qt::OpenGL Qt::OpenGL
) )

View File

@ -10,10 +10,9 @@ list(APPEND test_data "buglist.json")
add_qt_test(tst_qopenglconfig add_qt_test(tst_qopenglconfig
SOURCES SOURCES
tst_qopenglconfig.cpp tst_qopenglconfig.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qvulkan add_qt_test(tst_qvulkan
SOURCES SOURCES
tst_qvulkan.cpp tst_qvulkan.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -7,10 +7,9 @@
add_qt_test(tst_qrhi add_qt_test(tst_qrhi
SOURCES SOURCES
tst_qrhi.cpp tst_qrhi.cpp
LIBRARIES
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )
# Resources: # Resources:

View File

@ -7,10 +7,9 @@
add_qt_test(tst_qshader add_qt_test(tst_qshader
SOURCES SOURCES
tst_qshader.cpp tst_qshader.cpp
LIBRARIES
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )
# Resources: # Resources:

View File

@ -16,10 +16,9 @@ add_qt_test(tst_qcssparser
tst_qcssparser.cpp tst_qcssparser.cpp
DEFINES DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
LIBRARIES
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::GuiPrivate
Qt::Xml Qt::Xml
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -7,11 +7,10 @@
add_qt_test(tst_qfont add_qt_test(tst_qfont
SOURCES SOURCES
tst_qfont.cpp tst_qfont.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )
# Resources: # Resources:

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qfontcache add_qt_test(tst_qfontcache
SOURCES SOURCES
tst_qfontcache.cpp tst_qfontcache.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -10,11 +10,10 @@ list(APPEND test_data "LED_REAL.TTF")
add_qt_test(tst_qfontdatabase add_qt_test(tst_qfontdatabase
SOURCES SOURCES
tst_qfontdatabase.cpp tst_qfontdatabase.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -7,11 +7,10 @@
add_qt_test(tst_qfontmetrics add_qt_test(tst_qfontmetrics
SOURCES SOURCES
tst_qfontmetrics.cpp tst_qfontmetrics.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )
# Resources: # Resources:

View File

@ -7,8 +7,7 @@
add_qt_test(tst_qinputcontrol add_qt_test(tst_qinputcontrol
SOURCES SOURCES
tst_qinputcontrol.cpp tst_qinputcontrol.cpp
LIBRARIES
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -7,11 +7,10 @@
add_qt_test(tst_qrawfont add_qt_test(tst_qrawfont
SOURCES SOURCES
tst_qrawfont.cpp tst_qrawfont.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )
# Resources: # Resources:

View File

@ -15,10 +15,7 @@ add_qt_test(tst_qstatictext
##################################################################### #####################################################################
extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qtextblock add_qt_test(tst_qtextblock
SOURCES SOURCES
tst_qtextblock.cpp tst_qtextblock.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qtextcursor add_qt_test(tst_qtextcursor
SOURCES SOURCES
tst_qtextcursor.cpp tst_qtextcursor.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -8,10 +8,9 @@ add_qt_test(tst_qtextdocument
SOURCES SOURCES
common.h common.h
tst_qtextdocument.cpp tst_qtextdocument.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
Qt::Xml Qt::Xml
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qtextdocumentfragment add_qt_test(tst_qtextdocumentfragment
SOURCES SOURCES
tst_qtextdocumentfragment.cpp tst_qtextdocumentfragment.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qtextformat add_qt_test(tst_qtextformat
SOURCES SOURCES
tst_qtextformat.cpp tst_qtextformat.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qtextlayout add_qt_test(tst_qtextlayout
SOURCES SOURCES
tst_qtextlayout.cpp tst_qtextlayout.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -8,9 +8,8 @@ add_qt_test(tst_qtextlist
SOURCES SOURCES
../qtextdocument/common.h ../qtextdocument/common.h
tst_qtextlist.cpp tst_qtextlist.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -13,10 +13,9 @@ add_qt_test(tst_qtextmarkdownimporter
tst_qtextmarkdownimporter.cpp tst_qtextmarkdownimporter.cpp
DEFINES DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -13,10 +13,9 @@ add_qt_test(tst_qtextmarkdownwriter
tst_qtextmarkdownwriter.cpp tst_qtextmarkdownwriter.cpp
DEFINES DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
TESTDATA ${test_data} TESTDATA ${test_data}
) )

View File

@ -9,9 +9,8 @@ add_qt_test(tst_qtextodfwriter
tst_qtextodfwriter.cpp tst_qtextodfwriter.cpp
DEFINES DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

View File

@ -15,11 +15,10 @@ add_qt_test(tst_qtextpiecetable
SOURCES SOURCES
../qtextdocument/common.h ../qtextdocument/common.h
tst_qtextpiecetable.cpp tst_qtextpiecetable.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )
#### Keys ignored in scope 1:.:.:qtextpiecetable.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qtextpiecetable.pro:<TRUE>:

View File

@ -7,9 +7,8 @@
add_qt_test(tst_qtextscriptengine add_qt_test(tst_qtextscriptengine
SOURCES SOURCES
tst_qtextscriptengine.cpp tst_qtextscriptengine.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate
) )

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