AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"

Browse Source
This commit is contained in:
Alexandru Croitor 2020-02-13 23:27:47 +01:00
commit d4c8ad79c4
311 changed files with 724 additions and 806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindMtdev.cmake
View File

@ -2,6 +2,6 @@ find_package(PkgConfig)
pkg_check_modules(Mtdev mtdev IMPORTED_TARGET)
if (NOT TARGET PkgConfig::MtDev)
if (NOT TARGET PkgConfig::Mtdev)
set(Mtdev_FOUND 0)
endif()

26
cmake/Qt3rdPartyLibraryConfig.cmake.in Normal file
View File

@ -0,0 +1,26 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
get_filename_component(_import_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
get_filename_component(_import_prefix "${_import_prefix}" REALPATH)
# Extra cmake code begin
@extra_cmake_code@
# Extra cmake code end
# Find required dependencies, if any.
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake")
endif()
if (NOT QT_NO_CREATE_TARGETS)
include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Targets.cmake")
if(NOT QT_NO_CREATE_VERSIONLESS_TARGETS)
include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@VersionlessTargets.cmake")
endif()
endif()
foreach(extra_cmake_include @extra_cmake_includes@)
include("${CMAKE_CURRENT_LIST_DIR}/${extra_cmake_include}")
endforeach()

165
cmake/QtBuild.cmake
View File

@ -1024,7 +1024,14 @@ function(qt_register_target_dependencies target public_libs private_libs)
set(target_deps "")
endif()
foreach(lib IN LISTS public_libs private_libs)
# Only process private dependencies if target is a static library
get_target_property(target_type ${target} TYPE)
set(lib_list ${public_libs})
if (target_type STREQUAL "STATIC_LIBRARY")
list(APPEND lib_list ${private_libs})
endif()
foreach(lib IN LISTS lib_list)
if ("${lib}" MATCHES "^Qt::(.*)")
set(lib "${CMAKE_MATCH_1}")
if (lib STREQUAL Platform
@ -2929,6 +2936,142 @@ function(qt_add_cmake_library target)
endfunction()
#
# This function replaces qmake's qt_helper_lib feature. It is intended to
# compile 3rdparty libraries as part of the build.
#
function(qt_add_3rdparty_library target)
# Process arguments:
qt_parse_all_arguments(arg "qt_add_3rdparty_library"
"SHARED;MODULE;STATIC;INTERFACE;EXCEPTIONS"
"OUTPUT_DIRECTORY"
"${__default_private_args};${__default_public_args}"
${ARGN}
)
### Define Targets:
if(${arg_INTERFACE})
add_library("${target}" INTERFACE)
elseif(${arg_STATIC} OR (${arg_MODULE} AND NOT BUILD_SHARED_LIBS))
add_library("${target}" STATIC)
elseif(${arg_SHARED})
add_library("${target}" SHARED)
elseif(${arg_MODULE})
add_library("${target}" MODULE)
set_property(TARGET ${name} PROPERTY C_VISIBILITY_PRESET default)
set_property(TARGET ${name} PROPERTY CXX_VISIBILITY_PRESET default)
if(APPLE)
# CMake defaults to using .so extensions for loadable modules, aka plugins,
# but Qt plugins are actually suffixed with .dylib.
set_property(TARGET "${target}" PROPERTY SUFFIX ".dylib")
endif()
else()
add_library("${target}")
endif()
if (NOT arg_ARCHIVE_INSTALL_DIRECTORY AND arg_INSTALL_DIRECTORY)
set(arg_ARCHIVE_INSTALL_DIRECTORY "${arg_INSTALL_DIRECTORY}")
endif()
qt_internal_add_qt_repo_known_module(${target})
qt_internal_add_target_aliases(${target})
if (ANDROID)
qt_android_apply_arch_suffix("${target}")
endif()
qt_skip_warnings_are_errors_when_repo_unclean("${target}")
if(NOT arg_HEADER_MODULE)
set_target_properties(${target} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
ARCHIVE_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR}
QT_MODULE_IS_3RDPARTY_LIBRARY TRUE
)
qt_handle_multi_config_output_dirs("${target}")
set_target_properties(${target} PROPERTIES
OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}"
)
endif()
if(NOT arg_INTERFACE)
# This property is used for super builds with static libraries. We use
# it in QtPlugins.cmake.in to avoid "polluting" the dependency chain
# for the target in it's project directory.
# E.g: When we process find_package(Qt6 ... Gui) in QtDeclarative, the
# rules in QtPugins.cmake add all the known Gui plugins as interface
# dependencies. This in turn causes circular dependencies on every
# plugin which links against Gui. Plugin A -> GUI -> Plugin A ....
set_target_properties(${target} PROPERTIES QT_BUILD_PROJECT_NAME ${PROJECT_NAME})
endif()
if(NOT arg_EXCEPTIONS AND NOT arg_INTERFACE)
qt_internal_set_no_exceptions_flags("${target}")
endif()
qt_extend_target("${target}"
SOURCES ${arg_SOURCES}
INCLUDE_DIRECTORIES
${arg_INCLUDE_DIRECTORIES}
PUBLIC_INCLUDE_DIRECTORIES
${arg_PUBLIC_INCLUDE_DIRECTORIES}
PUBLIC_DEFINES
${arg_PUBLIC_DEFINES}
DEFINES
${arg_DEFINES}
PUBLIC_LIBRARIES ${arg_PUBLIC_LIBRARIES}
LIBRARIES ${arg_LIBRARIES}
COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
PUBLIC_COMPILE_OPTIONS ${arg_PUBLIC_COMPILE_OPTIONS}
LINK_OPTIONS ${arg_LINK_OPTIONS}
PUBLIC_LINK_OPTIONS ${arg_PUBLIC_LINK_OPTIONS}
MOC_OPTIONS ${arg_MOC_OPTIONS}
ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS}
DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS}
${install_arguments}
)
if(NOT BUILD_SHARED_LIBS OR arg_SHARED)
set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${target}")
qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix})
qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${path_suffix})
set(export_name "${INSTALL_CMAKE_NAMESPACE}${target}Targets")
configure_package_config_file(
"${QT_CMAKE_DIR}/Qt3rdPartyLibraryConfig.cmake.in"
"${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Config.cmake"
INSTALL_DESTINATION "${config_install_dir}"
)
write_basic_package_version_file(
"${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigVersion.cmake"
VERSION ${PROJECT_VERSION}
COMPATIBILITY AnyNewerVersion
)
qt_install(TARGETS ${target}
EXPORT "${export_name}"
DESTINATION "${config_install_dir}"
)
qt_install(EXPORT ${export_name}
NAMESPACE "${QT_CMAKE_EXPORT_NAMESPACE}::"
DESTINATION "${config_install_dir}"
)
qt_internal_export_modern_cmake_config_targets_file(
TARGETS ${target}
EXPORT_NAME_PREFIX ${INSTALL_CMAKE_NAMESPACE}${target}
CONFIG_INSTALL_DIR "${config_install_dir}"
)
endif()
endfunction()
function(qt_get_tool_cmake_configuration out_var)
qt_get_main_cmake_configuration("${out_var}")
string(TOUPPER "${${out_var}}" upper_config)
@ -3343,14 +3486,14 @@ function(qt_add_docs)
get_filename_component(doc_target "${doc_project}" NAME_WLE)
if (QT_WILL_INSTALL)
set(qdoc_output_dir "${CMAKE_BINARY_DIR}/doc/${doc_target}")
set(index_dir "${CMAKE_BINARY_DIR}/doc")
set(qdoc_output_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}/${doc_target}")
set(index_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}")
elseif (QT_SUPERBUILD)
set(qdoc_output_dir "${CMAKE_INSTALL_PREFIX}/qtbase/doc/${doc_target}")
set(index_dir "${CMAKE_INSTALL_PREFIX}/qtbase/doc")
set(qdoc_output_dir "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_DOCDIR}/${doc_target}")
set(index_dir "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_DOCDIR}")
else()
set(qdoc_output_dir "${CMAKE_INSTALL_PREFIX}/doc/${doc_target}")
set(index_dir "${CMAKE_INSTALL_PREFIX}/doc")
set(qdoc_output_dir "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}/${doc_target}")
set(index_dir "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}")
endif()
# qtattributionsscanner
@ -3365,7 +3508,7 @@ function(qt_add_docs)
# prepare docs target
set(prepare_qdoc_args
-outputdir "${qdoc_output_dir}"
-installdir "${QT_INSTALL_DIR}/doc"
-installdir "${QT_INSTALL_DIR}/${INSTALL_DOCDIR}"
"${target_source_dir}/${doc_project}"
-prepare
-indexdir "${index_dir}"
@ -3374,9 +3517,9 @@ function(qt_add_docs)
)
if (QT_SUPERBUILD AND NOT QT_WILL_INSTALL)
set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/qtbase/doc")
set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_DOCDIR}")
else()
set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/doc")
set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}")
endif()
set(qdoc_env_args
@ -3450,7 +3593,7 @@ function(qt_add_docs)
COMMAND ${CMAKE_COMMAND} -E copy_directory
"${qdoc_output_dir}"
"${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}/${doc_target}"
COMMENT "Installing html docs for target {$target}"
COMMENT "Installing html docs for target ${target}"
)
add_custom_target(install_qch_docs_${target}

4
cmake/QtPostProcess.cmake
View File

@ -68,9 +68,11 @@ function(qt_internal_create_module_depends_file target)
set(arg_HEADER_MODULE OFF)
endif()
if(NOT arg_HEADER_MODULE)
set(depends "")
if(target_type STREQUAL "STATIC_LIBRARY" AND NOT arg_HEADER_MODULE)
get_target_property(depends "${target}" LINK_LIBRARIES)
endif()
get_target_property(public_depends "${target}" INTERFACE_LINK_LIBRARIES)
# Used for collecting Qt module dependencies that should be find_package()'d in

7
examples/opengl/hellowindow/CMakeLists.txt
View File

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

7
examples/qpa/windows/CMakeLists.txt
View File

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

4
src/corelib/Qt6CoreMacros.cmake
View File

@ -737,6 +737,10 @@ function(qt6_generate_meta_types_json_file target)
file(MAKE_DIRECTORY "${target_binary_dir}/meta_types")
file(TOUCH ${metatypes_file})
endif()
if (arg_COPY_OVER_INSTALL AND NOT EXISTS ${arg_INSTALL_DIR}/${metatypes_file_name})
file(MAKE_DIRECTORY "${arg_INSTALL_DIR}")
file(TOUCH "${arg_INSTALL_DIR}/${metatypes_file_name}")
endif()
add_custom_command(OUTPUT ${metatypes_file_gen} ${metatypes_file}
DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::moc ${automoc_dependencies} ${manual_dependencies}
COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc

8
src/plugins/platforms/windows/.prev_CMakeLists.txt
View File

@ -122,7 +122,13 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
Qt::VulkanSupportPrivate
)
#### Keys ignored in scope 5:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
DEFINES
QT_USE_DIRECTWRITE2
QT_USE_DIRECTWRITE3
)
#### Keys ignored in scope 6:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2

8
src/plugins/platforms/windows/CMakeLists.txt
View File

@ -123,7 +123,13 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
Qt::VulkanSupportPrivate
)
#### Keys ignored in scope 5:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
DEFINES
QT_USE_DIRECTWRITE2
QT_USE_DIRECTWRITE3
)
#### Keys ignored in scope 6:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2

2
tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt
View File

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

2
tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
View File

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

2
tests/auto/corelib/global/qhooks/CMakeLists.txt
View File

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

2
tests/auto/corelib/global/qnumeric/CMakeLists.txt
View File

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

2
tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt
View File

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

2
tests/auto/corelib/global/qtendian/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qdataurl/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qdir/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qdiriterator/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qfileinfo/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qipaddress/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
View File

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

3
tests/auto/corelib/io/qsettings/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qurlinternal/CMakeLists.txt
View File

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

2
tests/auto/corelib/io/qurlquery/CMakeLists.txt
View File

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

3
tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
View File

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

2
tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
View File

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

2
tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
View File

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

2
tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
View File

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

2
tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
View File

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

5
tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
View File

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

2
tests/auto/corelib/kernel/qtimer/CMakeLists.txt
View File

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

2
tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt
View File

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

2
tests/auto/corelib/kernel/qvariant/CMakeLists.txt
View File

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

2
tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
View File

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

2
tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt
View File

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

2
tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
View File

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

2
tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
View File

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

4
tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
View File

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

2
tests/auto/corelib/serialization/json/CMakeLists.txt
View File

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

2
tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt
View File

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

2
tests/auto/corelib/text/qstringiterator/CMakeLists.txt
View File

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

2
tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt
View File

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

2
tests/auto/corelib/thread/qfuture/CMakeLists.txt
View File

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

3
tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt
View File

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

4
tests/auto/corelib/thread/qmutex/CMakeLists.txt
View File

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

2
tests/auto/corelib/thread/qresultstore/CMakeLists.txt
View File

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

2
tests/auto/corelib/time/qdate/CMakeLists.txt
View File

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

2
tests/auto/corelib/time/qdatetime/CMakeLists.txt
View File

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

2
tests/auto/corelib/time/qtimezone/CMakeLists.txt
View File

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

2
tests/auto/corelib/tools/qmakearray/CMakeLists.txt
View File

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

2
tests/auto/corelib/tools/qringbuffer/CMakeLists.txt
View File

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

4
tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
View File

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

4
tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
View File

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

4
tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
View File

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

4
tests/auto/dbus/qdbustype/CMakeLists.txt
View File

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

4
tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
View File

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

5
tests/auto/gui/image/qimage/CMakeLists.txt
View File

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

5
tests/auto/gui/image/qimagereader/CMakeLists.txt
View File

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

8
tests/auto/gui/image/qpixmap/CMakeLists.txt
View File

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

3
tests/auto/gui/image/qpixmapcache/CMakeLists.txt
View File

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

5
tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
View File

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

5
tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
View File

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

4
tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
View File

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

4
tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
View File

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

3
tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
View File

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

3
tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
View File

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

3
tests/auto/gui/kernel/qguitimer/CMakeLists.txt
View File

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

5
tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
View File

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

5
tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
View File

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

5
tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
View File

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

5
tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
View File

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

5
tests/auto/gui/kernel/qscreen/CMakeLists.txt
View File

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

5
tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
View File

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

3
tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
View File

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

5
tests/auto/gui/kernel/qwindow/CMakeLists.txt
View File

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

5
tests/auto/gui/qopengl/CMakeLists.txt
View File

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

5
tests/auto/gui/qopenglconfig/CMakeLists.txt
View File

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

5
tests/auto/gui/qvulkan/CMakeLists.txt
View File

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

3
tests/auto/gui/rhi/qrhi/CMakeLists.txt
View File

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

3
tests/auto/gui/rhi/qshader/CMakeLists.txt
View File

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

3
tests/auto/gui/text/qcssparser/CMakeLists.txt
View File

@ -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}
)

5
tests/auto/gui/text/qfont/CMakeLists.txt
View File

@ -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:

5
tests/auto/gui/text/qfontcache/CMakeLists.txt
View File

@ -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
)

5
tests/auto/gui/text/qfontdatabase/CMakeLists.txt
View File

@ -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}
)

5
tests/auto/gui/text/qfontmetrics/CMakeLists.txt
View File

@ -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:

3
tests/auto/gui/text/qinputcontrol/CMakeLists.txt
View File

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

5
tests/auto/gui/text/qrawfont/CMakeLists.txt
View File

@ -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:

5
tests/auto/gui/text/qstatictext/CMakeLists.txt
View File

@ -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
)

5
tests/auto/gui/text/qtextblock/CMakeLists.txt
View File

@ -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
)

5
tests/auto/gui/text/qtextcursor/CMakeLists.txt
View File

@ -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
)

5
tests/auto/gui/text/qtextdocument/CMakeLists.txt
View File

@ -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
)

5
tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
View File

@ -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
)

5
tests/auto/gui/text/qtextformat/CMakeLists.txt
View File

@ -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
)

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