1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate files after dev -> wip/cmake merge

Browse Source 
Note the following bigger things that had to be done:
Handle GSS library / feature with a new custom find module.
Implement rudimentary support for relocatability (does not currently
handle extprefix).

Change-Id: Ic6cd27dda7ebca9829f51cb42ea76fff6d1767ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-10-11 16:55:55 +02:00
parent 440286655e
commit 190e9dcdcf
25 changed files with 200 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cmake/FindGSSAPI.cmake Normal file
View File

@ -0,0 +1,39 @@
find_package(PkgConfig)
pkg_check_modules(PC_GSSAPI QUIET krb5-gssapi)
find_path(GSSAPI_INCLUDE_DIRS
NAMES gssapi/gssapi.h
HINTS ${PC_GSSAPI_INCLUDEDIR}
PATH_SUFFIXES gssapi)
find_library(GSSAPI_LIBRARIES
NAMES
GSS # framework
gssapi_krb5
HINTS ${PC_GSSAPILIBDIR}
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(GSSAPI DEFAULT_MSG GSSAPI_LIBRARIES GSSAPI_INCLUDE_DIRS)
if(GSSAPI_FOUND AND NOT TARGET GSSAPI::GSSAPI)
if(GSSAPI_LIBRARIES MATCHES "/([^/]+)\\.framework$")
add_library(GSSAPI::GSSAPI INTERFACE IMPORTED)
set_target_properties(GSSAPI::GSSAPI PROPERTIES
INTERFACE_LINK_LIBRARIES "${GSSAPI_LIBRARIES}")
else()
add_library(GSSAPI::GSSAPI UNKNOWN IMPORTED)
set_target_properties(GSSAPI::GSSAPI PROPERTIES
IMPORTED_LOCATION "${GSSAPI_LIBRARIES}")
endif()
set_target_properties(GSSAPI::GSSAPI PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${GSSAPI_INCLUDE_DIRS}")
endif()
mark_as_advanced(GSSAPI_INCLUDE_DIRS GSSAPI_LIBRARIES)
include(FeatureSummary)
set_package_properties(GSSAPI PROPERTIES
DESCRIPTION "Generic Security Services Application Program Interface")

39
cmake/QtBuild.cmake
View File

@ -3263,5 +3263,44 @@ function(qt_generate_qconfig_cpp)
set(QT_CONFIG_STR_OFFSETS_SECOND "${QT_CONFIG_STR_OFFSETS}")
set(QT_CONFIG_STRS_SECOND "${QT_CONFIG_STRS}")
# Settings path / sysconf dir.
if(APPLE)
set(QT_DEFAULT_SYS_CONF_DIR "/Library/Preferences/Qt")
else()
set(QT_DEFAULT_SYS_CONF_DIR "etc/xdg")
endif()
# Compute and set relocation prefixes.
# TODO: Clean this up, there's a bunch of unrealistic assumptions here.
# See qtConfOutput_preparePaths in qtbase/configure.pri.
if(WIN32)
set(lib_location_absolute_path "${CMAKE_INSTALL_PREFIX}/bin")
else()
set(lib_location_absolute_path "${CMAKE_INSTALL_PREFIX}/lib")
endif()
file(RELATIVE_PATH from_lib_location_to_prefix
"${lib_location_absolute_path}" "${CMAKE_INSTALL_PREFIX}")
if(QT_HOST_PATH)
set(host_prefix "${QT_HOST_PATH}")
set(host_bin_dir_absolute_path "${QT_HOST_PATH}/bin")
else()
set(host_prefix "${CMAKE_INSTALL_PREFIX}")
set(host_bin_dir_absolute_path "${CMAKE_INSTALL_PREFIX}/bin")
endif()
file(RELATIVE_PATH from_host_bin_dir_to_host_prefix
"${host_bin_dir_absolute_path}" "${host_prefix}")
# TODO: Fix this to use the equivalent of extprefix on CMake (CMAKE_STAGING_PREFIX?)
# For now just assume ext prefix is same as regular prefix.
file(RELATIVE_PATH from_host_bin_dir_to_ext_prefix
"${host_bin_dir_absolute_path}" "${CMAKE_INSTALL_PREFIX}")
set(QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH "${from_lib_location_to_prefix}")
set(QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH "${from_host_bin_dir_to_host_prefix}")
set(QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH "${from_host_bin_dir_to_ext_prefix}")
configure_file(global/qconfig.cpp.in global/qconfig.cpp @ONLY)
endfunction()

48
configure.cmake
View File

@ -33,7 +33,7 @@ int main(int argc, char **argv)
/* END TEST: */
return 0;
}
"# FIXME: qmake: CONFIG += c++11 c++14 c++1z c++2a
"# FIXME: qmake: CONFIG += c++11 c++14 c++17 c++2a
)
# precompile_header
@ -74,6 +74,23 @@ int main(int argc, char **argv)
"# FIXME: qmake: ['TEMPLATE = lib', 'CONFIG += dll bsymbolic_functions', 'isEmpty(QMAKE_LFLAGS_BSYMBOLIC_FUNC): error("Nope")']
)
# signaling_nan
qt_config_compile_test(signaling_nan
LABEL "Signaling NaN for doubles"
"#include <limits>
int main(int argc, char **argv)
{
(void)argc; (void)argv;
/* BEGIN TEST: */
using B = std::numeric_limits<double>;
static_assert(B::has_signaling_NaN, \"System lacks signaling NaN\");
/* END TEST: */
return 0;
}
")
# sse2
qt_config_compile_test_x86simd(sse2 "SSE2 instructions")
@ -98,6 +115,9 @@ qt_config_compile_test_x86simd(f16c "F16C instructions")
# rdrnd
qt_config_compile_test_x86simd(rdrnd "RDRAND instruction")
# rdseed
qt_config_compile_test_x86simd(rdseed "RDSEED instruction")
# shani
qt_config_compile_test_x86simd(shani "SHA new instructions")
@ -276,20 +296,28 @@ qt_feature("cxx14" PUBLIC
LABEL "C++14"
CONDITION QT_FEATURE_cxx11 AND $<COMPILE_FEATURES:cxx_std_14>
)
qt_feature("cxx1z" PUBLIC
qt_feature("cxx17" PUBLIC
LABEL "C++17"
CONDITION QT_FEATURE_cxx14 AND $<COMPILE_FEATURES:cxx_std_17>
)
qt_feature("cxx1z" PUBLIC
LABEL "C++17"
CONDITION QT_FEATURE_cxx17
)
qt_feature("cxx2a" PUBLIC
LABEL "C++2a"
AUTODETECT OFF
CONDITION QT_FEATURE_cxx1z AND TEST_cxx2a
CONDITION QT_FEATURE_cxx17 AND TEST_cxx2a
)
qt_feature("reduce_exports" PRIVATE
LABEL "Reduce amount of exported symbols"
CONDITION NOT WIN32 AND CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY
)
qt_feature_definition("reduce_exports" "QT_VISIBILITY_AVAILABLE")
qt_feature("signaling_nan" PUBLIC
LABEL "Signaling NaN"
CONDITION TEST_signaling_nan
)
qt_feature("sse2" PRIVATE
LABEL "SSE2"
CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) AND TEST_subarch_sse2
@ -385,6 +413,11 @@ qt_feature("rdrnd"
CONDITION TEST_subarch_rdseed
)
qt_feature_definition("rdrnd" "QT_COMPILER_SUPPORTS_RDRND" VALUE "1")
qt_feature("rdseed"
LABEL "RDSEED"
CONDITION TEST_subarch_rdseed
)
qt_feature_definition("rdseed" "QT_COMPILER_SUPPORTS_RDSEED" VALUE "1")
qt_feature("shani"
LABEL "SHA"
CONDITION QT_FEATURE_sse2 AND TEST_subarch_sha
@ -483,6 +516,15 @@ qt_feature("libudev" PRIVATE
LABEL "udev"
CONDITION Libudev_FOUND
)
qt_feature("dlopen" PRIVATE
LABEL "dlopen()"
CONDITION UNIX
)
qt_feature("relocatable" PRIVATE
LABEL "Relocatable"
AUTODETECT QT_FEATURE_shared
CONDITION QT_FEATURE_dlopen OR WIN32 OR NOT QT_FEATURE_shared
)
qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC)
qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC)

4
src/corelib/.prev_CMakeLists.txt
View File

@ -173,7 +173,7 @@ add_qt_module(Core
thread/qrunnable.cpp thread/qrunnable.h
thread/qthread.cpp thread/qthread.h
thread/qthreadstorage.h
thread/qwaitcondition.h
thread/qwaitcondition.h thread/qwaitcondition_p.h
time/qcalendar.cpp time/qcalendar.h
time/qcalendarbackend_p.h
time/qcalendarmath_p.h
@ -257,7 +257,7 @@ if(ANDROID)
jar/QtAndroid.jar
)
set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
plugins/platforms/android/libqtforandroid.so
plugins/platforms/libplugins_platforms_qtforandroid.so
)
set_property(TARGET Core APPEND PROPERTY QT_ANDROID_PERMISSIONS
android.permission.INTERNET android.permission.WRITE_EXTERNAL_STORAGE

4
src/corelib/CMakeLists.txt
View File

@ -187,7 +187,7 @@ add_qt_module(Core
thread/qrunnable.cpp thread/qrunnable.h
thread/qthread.cpp thread/qthread.h
thread/qthreadstorage.h
thread/qwaitcondition.h
thread/qwaitcondition.h thread/qwaitcondition_p.h
time/qcalendar.cpp time/qcalendar.h
time/qcalendarbackend_p.h
time/qcalendarmath_p.h
@ -341,7 +341,7 @@ if(ANDROID)
jar/QtAndroid.jar
)
set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
plugins/platforms/android/libqtforandroid.so
plugins/platforms/libplugins_platforms_qtforandroid.so
)
set_property(TARGET Core APPEND PROPERTY QT_ANDROID_PERMISSIONS
android.permission.INTERNET android.permission.WRITE_EXTERNAL_STORAGE

6
src/corelib/configure.cmake
View File

@ -488,10 +488,6 @@ qt_feature("clock_monotonic" PUBLIC
CONDITION QT_FEATURE_clock_gettime AND TEST_clock_monotonic
)
qt_feature_definition("clock_monotonic" "QT_NO_CLOCK_MONOTONIC" NEGATE VALUE "1")
qt_feature("dlopen" PRIVATE
LABEL "dlopen()"
CONDITION UNIX
)
qt_feature("cxx11_future" PUBLIC
LABEL "C++11 <future>"
CONDITION TEST_cxx11_future
@ -699,7 +695,7 @@ qt_feature_definition("textdate" "QT_NO_TEXTDATE" NEGATE VALUE "1")
qt_feature("datestring" PUBLIC
SECTION "Data structures"
LABEL "QDate/QTime/QDateTime"
PURPOSE "Provides convertion between dates and strings."
PURPOSE "Provides conversion between dates and strings."
CONDITION QT_FEATURE_textdate
)
qt_feature_definition("datestring" "QT_NO_DATESTRING" NEGATE VALUE "1")

5
src/corelib/global/qconfig.cpp.in
View File

@ -18,7 +18,10 @@ static const char qt_configure_strs[] =
@QT_CONFIG_STRS_SECOND@
#endif
;
#define QT_CONFIGURE_SETTINGS_PATH "etc/xdg"
#define QT_CONFIGURE_SETTINGS_PATH "@QT_DEFAULT_SYS_CONF_DIR@"
#define QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH "@QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH@"
#define QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH@"
#define QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH@"
#ifdef QT_BUILD_QMAKE
# define QT_CONFIGURE_SYSROOTIFY_PREFIX false
#endif

9
src/network/.prev_CMakeLists.txt
View File

@ -82,7 +82,7 @@ if(ANDROID AND (QT_FEATURE_bearermanagement))
jar/QtAndroidBearer.jar
)
set_property(TARGET Network APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
plugins/bearer/libqandroidbearer.so
plugins/bearer/libplugins_bearer_qandroidbearer.so
)
set_property(TARGET Network APPEND PROPERTY QT_ANDROID_PERMISSIONS
android.permission.ACCESS_NETWORK_STATE
@ -141,11 +141,6 @@ extend_target(Network CONDITION QT_FEATURE_http
socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
)
extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_ssl
SOURCES
access/qspdyprotocolhandler.cpp access/qspdyprotocolhandler_p.h
)
extend_target(Network CONDITION QT_FEATURE_dnslookup
SOURCES
kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h
@ -235,7 +230,7 @@ extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATU
extend_target(Network CONDITION QT_FEATURE_gssapi
LIBRARIES
gssapi_krb5
GSSAPI::GSSAPI
)
extend_target(Network CONDITION APPLE_UIKIT

9
src/network/CMakeLists.txt
View File

@ -82,7 +82,7 @@ if(ANDROID AND (QT_FEATURE_bearermanagement))
jar/QtAndroidBearer.jar
)
set_property(TARGET Network APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
plugins/bearer/libqandroidbearer.so
plugins/bearer/libplugins_bearer_qandroidbearer.so
)
set_property(TARGET Network APPEND PROPERTY QT_ANDROID_PERMISSIONS
android.permission.ACCESS_NETWORK_STATE
@ -141,11 +141,6 @@ extend_target(Network CONDITION QT_FEATURE_http
socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
)
extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_ssl
SOURCES
access/qspdyprotocolhandler.cpp access/qspdyprotocolhandler_p.h
)
extend_target(Network CONDITION QT_FEATURE_dnslookup
SOURCES
kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h
@ -237,7 +232,7 @@ extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATU
extend_target(Network CONDITION QT_FEATURE_gssapi
LIBRARIES
gssapi_krb5
GSSAPI::GSSAPI
)
extend_target(Network CONDITION APPLE_UIKIT

21
src/network/configure.cmake
View File

@ -9,6 +9,7 @@
qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy)
qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL)
qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL)
qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI)
#### Tests
@ -165,23 +166,6 @@ int main(int argc, char **argv)
"# FIXME: use: openssl
)
# gssapi
qt_config_compile_test(gssapi
LABEL "KRB5 GSSAPI support"
"
#include <gssapi/gssapi.h>
int main(int argc, char **argv)
{
(void)argc; (void)argv;
/* BEGIN TEST: */
gss_ctx_id_t ctx;
/* END TEST: */
return 0;
}
"# FIXME: qmake: LIBS += -lgssapi_krb5
)
# netlistmgr
qt_config_compile_test(netlistmgr
LABEL "Network List Manager"
@ -349,6 +333,7 @@ qt_feature("bearermanagement" PUBLIC
CONDITION QT_FEATURE_thread AND QT_FEATURE_library AND QT_FEATURE_networkinterface AND QT_FEATURE_properties
)
qt_feature_definition("bearermanagement" "QT_NO_BEARERMANAGEMENT" NEGATE VALUE "1")
qt_feature_definition("bearermanagement" "QT_NO_BEARERMANAGEMENT" NEGATE)
qt_feature("localserver" PUBLIC
SECTION "Networking"
LABEL "QLocalServer"
@ -365,7 +350,7 @@ qt_feature("gssapi" PUBLIC
SECTION "Networking"
LABEL "GSSAPI"
PURPOSE "Enable SPNEGO authentication through GSSAPI"
CONDITION NOT WIN32 AND TEST_gssapi
CONDITION NOT WIN32 AND GSSAPI_FOUND
)
qt_feature_definition("gssapi" "QT_NO_GSSAPI" NEGATE VALUE "1")
qt_feature("sspi" PUBLIC

6
src/plugins/platforms/android/.prev_CMakeLists.txt
View File

@ -6,7 +6,7 @@
add_qt_plugin(qtforandroid
TYPE platforms
OUTPUT_DIRECTORY "$$DESTDIR/android"
CLASS_NAME QAndroidIntegrationPlugin
SOURCES
androidcontentfileengine.cpp androidcontentfileengine.h
androiddeadlockprotector.cpp androiddeadlockprotector.h
@ -17,6 +17,7 @@ add_qt_plugin(qtforandroid
androidjnimenu.cpp androidjnimenu.h
androidplatformplugin.cpp
androidsurfaceclient.h
main.cpp
qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h
qandroideventdispatcher.cpp qandroideventdispatcher.h
qandroidinputcontext.cpp qandroidinputcontext.h
@ -39,8 +40,6 @@ add_qt_plugin(qtforandroid
qandroidplatformtheme.cpp qandroidplatformtheme.h
qandroidplatformwindow.cpp qandroidplatformwindow.h
qandroidsystemlocale.cpp qandroidsystemlocale.h
DEFINES
QT_STATICPLUGIN
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
${QT_SOURCE_TREE}/src/3rdparty/android
@ -65,7 +64,6 @@ add_qt_plugin(qtforandroid
#### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
# OTHER_FILES = "$$PWD/android.json"
# _LOADED = "qt_plugin"
# target.path = "$${target.path}/android"
## Scopes:
#####################################################################

6
src/plugins/platforms/android/CMakeLists.txt
View File

@ -6,7 +6,7 @@
add_qt_plugin(qtforandroid
TYPE platforms
# OUTPUT_DIRECTORY "$$DESTDIR/android" # special case remove
CLASS_NAME QAndroidIntegrationPlugin
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case
SOURCES
androidcontentfileengine.cpp androidcontentfileengine.h
@ -18,6 +18,7 @@ add_qt_plugin(qtforandroid
androidjnimenu.cpp androidjnimenu.h
androidplatformplugin.cpp
androidsurfaceclient.h
main.cpp
qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h
qandroideventdispatcher.cpp qandroideventdispatcher.h
qandroidinputcontext.cpp qandroidinputcontext.h
@ -40,8 +41,6 @@ add_qt_plugin(qtforandroid
qandroidplatformtheme.cpp qandroidplatformtheme.h
qandroidplatformwindow.cpp qandroidplatformwindow.h
qandroidsystemlocale.cpp qandroidsystemlocale.h
DEFINES
QT_STATICPLUGIN
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
${QT_SOURCE_TREE}/src/3rdparty/android
@ -74,7 +73,6 @@ add_qt_plugin(qtforandroid
#### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
# OTHER_FILES = "$$PWD/android.json"
# _LOADED = "qt_plugin"
# target.path = "$${target.path}/android"
## Scopes:
#####################################################################

34
src/plugins/platforms/cocoa/.prev_CMakeLists.txt
View File

@ -10,8 +10,6 @@ add_qt_plugin(qcocoa
SOURCES
main.mm
messages.cpp messages.h
qcocoaaccessibility.h qcocoaaccessibility.mm
qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
qcocoaapplication.h qcocoaapplication.mm
qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm
qcocoabackingstore.h qcocoabackingstore.mm
@ -45,7 +43,6 @@ add_qt_plugin(qcocoa
qnswindow.h qnswindow.mm
qnswindowdelegate.h qnswindowdelegate.mm
LIBRARIES
Qt::AccessibilitySupportPrivate
Qt::ClipboardSupportPrivate
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
@ -62,7 +59,6 @@ add_qt_plugin(qcocoa
${FWMetal}
${FWQuartzCore}
Cups::Cups
Qt::AccessibilitySupport
Qt::ClipboardSupport
Qt::Core
Qt::FontDatabaseSupport
@ -107,23 +103,39 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan
Qt::VulkanSupport
)
extend_target(qcocoa CONDITION QT_FEATURE_accessibility
SOURCES
qcocoaaccessibility.h qcocoaaccessibility.mm
qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
LIBRARIES
Qt::AccessibilitySupportPrivate
PUBLIC_LIBRARIES
Qt::AccessibilitySupport
)
extend_target(qcocoa CONDITION TARGET Qt::Widgets
SOURCES
qcocoaprintdevice.h qcocoaprintdevice.mm
qcocoaprintersupport.h qcocoaprintersupport.mm
qpaintengine_mac.mm qpaintengine_mac_p.h
qprintengine_mac.mm qprintengine_mac_p.h
LIBRARIES
Qt::PrintSupportPrivate
Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::PrintSupport
Qt::Widgets
)
#### Keys ignored in scope 5:.:.:cocoa.pro:TARGET Qt::Widgets:
#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets:
# QT_FOR_CONFIG = "widgets"
extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
SOURCES
qcocoaprintdevice.h qcocoaprintdevice.mm
qcocoaprintersupport.h qcocoaprintersupport.mm
qprintengine_mac.mm qprintengine_mac_p.h
LIBRARIES
Qt::PrintSupportPrivate
PUBLIC_LIBRARIES
Qt::PrintSupport
)
extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets
SOURCES
qcocoacolordialoghelper.h qcocoacolordialoghelper.mm
@ -139,5 +151,5 @@ extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
)
#### Keys ignored in scope 9:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"

34
src/plugins/platforms/cocoa/CMakeLists.txt
View File

@ -14,8 +14,6 @@ add_qt_plugin(qcocoa
SOURCES
main.mm
messages.cpp messages.h
qcocoaaccessibility.h qcocoaaccessibility.mm
qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
qcocoaapplication.h qcocoaapplication.mm
qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm
qcocoabackingstore.h qcocoabackingstore.mm
@ -49,7 +47,6 @@ add_qt_plugin(qcocoa
qnswindow.h qnswindow.mm
qnswindowdelegate.h qnswindowdelegate.mm
LIBRARIES
Qt::AccessibilitySupportPrivate
Qt::ClipboardSupportPrivate
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
@ -66,7 +63,6 @@ add_qt_plugin(qcocoa
${FWMetal}
${FWQuartzCore}
Cups::Cups
Qt::AccessibilitySupport
Qt::ClipboardSupport
Qt::Core
Qt::FontDatabaseSupport
@ -111,23 +107,39 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan
Qt::VulkanSupport
)
extend_target(qcocoa CONDITION QT_FEATURE_accessibility
SOURCES
qcocoaaccessibility.h qcocoaaccessibility.mm
qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
LIBRARIES
Qt::AccessibilitySupportPrivate
PUBLIC_LIBRARIES
Qt::AccessibilitySupport
)
extend_target(qcocoa CONDITION TARGET Qt::Widgets
SOURCES
qcocoaprintdevice.h qcocoaprintdevice.mm
qcocoaprintersupport.h qcocoaprintersupport.mm
qpaintengine_mac.mm qpaintengine_mac_p.h
qprintengine_mac.mm qprintengine_mac_p.h
LIBRARIES
Qt::PrintSupportPrivate
Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::PrintSupport
Qt::Widgets
)
#### Keys ignored in scope 5:.:.:cocoa.pro:TARGET Qt::Widgets:
#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets:
# QT_FOR_CONFIG = "widgets"
extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
SOURCES
qcocoaprintdevice.h qcocoaprintdevice.mm
qcocoaprintersupport.h qcocoaprintersupport.mm
qprintengine_mac.mm qprintengine_mac_p.h
LIBRARIES
Qt::PrintSupportPrivate
PUBLIC_LIBRARIES
Qt::PrintSupport
)
extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets
SOURCES
qcocoacolordialoghelper.h qcocoacolordialoghelper.mm
@ -143,5 +155,5 @@ extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
)
#### Keys ignored in scope 9:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"

1
src/tools/bootstrap/.prev_CMakeLists.txt
View File

@ -65,6 +65,7 @@ add_qt_module(Bootstrap
../../corelib/serialization/qxmlstream.cpp
../../corelib/serialization/qxmlutils.cpp
../../corelib/text/qbytearray.cpp
../../corelib/text/qbytearraylist.cpp
../../corelib/text/qbytearraymatcher.cpp
../../corelib/text/qlocale.cpp
../../corelib/text/qlocale_tools.cpp

1
src/tools/bootstrap/CMakeLists.txt
View File

@ -63,6 +63,7 @@ extend_target(Bootstrap
../../corelib/serialization/qxmlstream.cpp
../../corelib/serialization/qxmlutils.cpp
../../corelib/text/qbytearray.cpp
../../corelib/text/qbytearraylist.cpp
../../corelib/text/qbytearraymatcher.cpp
../../corelib/text/qlocale.cpp
../../corelib/text/qlocale_tools.cpp

1
src/tools/moc/.prev_CMakeLists.txt
View File

@ -8,6 +8,7 @@ add_qt_tool(moc
BOOTSTRAP
SOURCES
cbordevice.h
collectjson.cpp collectjson.h
generator.cpp generator.h
moc.cpp moc.h
outputrevision.h

1
src/tools/moc/CMakeLists.txt
View File

@ -9,6 +9,7 @@ add_qt_tool(moc
TOOLS_TARGET Core # special case
SOURCES
cbordevice.h
collectjson.cpp collectjson.h
generator.cpp generator.h
main.cpp # special case
moc.cpp moc.h

1
src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
View File

@ -7,6 +7,7 @@
add_qt_tool(qdbuscpp2xml
SOURCES
../moc/cbordevice.h
../moc/collectjson.cpp ../moc/collectjson.h
../moc/generator.cpp ../moc/generator.h
../moc/moc.cpp ../moc/moc.h
../moc/outputrevision.h

1
src/tools/qdbuscpp2xml/CMakeLists.txt
View File

@ -8,6 +8,7 @@ add_qt_tool(qdbuscpp2xml
TOOLS_TARGET DBus # special case
SOURCES
../moc/cbordevice.h
../moc/collectjson.cpp ../moc/collectjson.h
../moc/generator.cpp ../moc/generator.h
../moc/moc.cpp ../moc/moc.h
../moc/outputrevision.h

1
tests/auto/network/access/CMakeLists.txt
View File

@ -6,7 +6,6 @@ add_subdirectory(qnetworkaccessmanager)
add_subdirectory(qnetworkcookie)
add_subdirectory(qnetworkrequest)
add_subdirectory(qnetworkreply)
add_subdirectory(spdy)
add_subdirectory(qnetworkcachemetadata)
add_subdirectory(qabstractnetworkcache)

25
tests/auto/network/access/spdy/CMakeLists.txt
View File

@ -1,25 +0,0 @@
# Generated from spdy.pro.
#####################################################################
## tst_spdy Test:
#####################################################################
add_qt_test(tst_spdy
GUI
SOURCES
tst_spdy.cpp
LIBRARIES
Qt::CorePrivate
Qt::NetworkPrivate
PUBLIC_LIBRARIES
Qt::Network
)
#### Keys ignored in scope 1:.:.:spdy.pro:<TRUE>:
# CONFIG = "testcase"
## Scopes:
#####################################################################
#### Keys ignored in scope 2:.:.:spdy.pro:WIN32:
# CONFIG = "insignificant_test"

3
tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
View File

@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qudpsocket
GUI
SOURCES
../tst_qudpsocket.cpp
INCLUDE_DIRECTORIES
@ -15,7 +14,6 @@ add_qt_test(tst_qudpsocket
)
#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
# CONFIG = "testcase"
# MOC_DIR = "tmp"
# testcase.timeout = "800"
@ -32,5 +30,4 @@ add_qt_test(tst_qudpsocket
# DESTDIR = "../"
#### Keys ignored in scope 6:.:.:test.pro:LINUX:
# CONFIG = "unsupported/testserver"
# QT_TEST_SERVER_LIST = "danted" "echo"

4
util/cmake/configurejson2cmake.py
View File

@ -57,6 +57,8 @@ def map_tests(test: str) -> Optional[str]:
"c++11": "$<COMPILE_FEATURES:cxx_std_11>",
"c++14": "$<COMPILE_FEATURES:cxx_std_14>",
"c++1z": "$<COMPILE_FEATURES:cxx_std_17>",
"c++17": "$<COMPILE_FEATURES:cxx_std_17>",
"c++20": "$<COMPILE_FEATURES:cxx_std_20>",
"c99": "$<COMPILE_FEATURES:c_std_99>",
"c11": "$<COMPILE_FEATURES:c_std_11>",
"x86SimdAlways": "ON", # FIXME: Make this actually do a compile test.
@ -489,6 +491,8 @@ def parseTest(ctx, test, data, cm_fh):
skip_tests = {
"c++11",
"c++14",
"c++17",
"c++20",
"c++1y",
"c++1z",
"c11",

1
util/cmake/helper.py
View File

@ -374,6 +374,7 @@ _library_map = [
LibraryMapping("glib", "GLIB2", "GLIB2::GLIB2"),
LibraryMapping("gnu_iconv", None, None),
LibraryMapping("gtk3", "GTK3", "PkgConfig::GTK3"),
LibraryMapping("gssapi", "GSSAPI", "GSSAPI::GSSAPI"),
LibraryMapping("harfbuzz", "harfbuzz", "harfbuzz::harfbuzz"),
LibraryMapping("host_dbus", None, None),
LibraryMapping(