diff options
12 files changed, 37 insertions, 11 deletions
diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt index 37b4c00784..7d8c21aa8a 100644 --- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt @@ -65,6 +65,7 @@ qt_disable_warnings(BundledHarfbuzz) qt_set_symbol_visibility_hidden(BundledHarfbuzz) #### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>: +# MODULE_EXT_HEADERS = "src/hb-atomic.hh" "src/hb-algs.hh" "src/hb-buffer.hh" "src/hb-buffer-deserialize-json.hh" "src/hb-buffer-deserialize-text.hh" "src/hb-cache.hh" "src/hb-debug.hh" "src/hb-face.hh" "src/hb-font.hh" "src/hb-mutex.hh" "src/hb-object.hh" "src/hb-open-file.hh" "src/hb-open-type.hh" "src/hb-set-digest.hh" "src/hb-set.hh" "src/hb-shape-plan.hh" "src/hb-shaper-impl.hh" "src/hb-shaper-list.hh" "src/hb-shaper.hh" "src/hb-string-array.hh" "src/hb-unicode.hh" "src/hb-utf.hh" "src/hb.h" "src/hb-blob.h" "src/hb-buffer.h" "src/hb-common.h" "src/hb-deprecated.h" "src/hb-face.h" "src/hb-font.h" "src/hb-set.h" "src/hb-shape.h" "src/hb-shape-plan.h" "src/hb-unicode.h" "src/hb-version.h" # OTHER_FILES = "$$PWD/src/harfbuzz.cc" # SHAPERS = "opentype" diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index 8405da6b52..653609e73b 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -18,11 +18,9 @@ qt_internal_add_module(Core global/qglobal.cpp global/qglobal.h global/qglobalstatic.h global/qhooks.cpp global/qhooks_p.h - global/qisenum.h global/qlibraryinfo.cpp global/qlibraryinfo.h global/qlogging.cpp global/qlogging.h global/qmalloc.cpp - global/qmemory_p.h global/qnamespace.h global/qnumeric.cpp global/qnumeric.h global/qnumeric_p.h global/qoperatingsystemversion.cpp global/qoperatingsystemversion.h global/qoperatingsystemversion_p.h @@ -204,7 +202,7 @@ qt_internal_add_module(Core tools/qrect.cpp tools/qrect.h tools/qrefcount.cpp tools/qrefcount.h tools/qringbuffer.cpp tools/qringbuffer_p.h - tools/qscopedpointer.h tools/qscopedpointer_p.h + tools/qscopedpointer.h tools/qscopedvaluerollback.h tools/qscopeguard.h tools/qset.h diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index aa7963cbc9..5cee38418a 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -35,8 +35,8 @@ qt_internal_add_module(Gui image/qxpmhandler.cpp image/qxpmhandler_p.h kernel/qclipboard.cpp kernel/qclipboard.h kernel/qcursor.cpp kernel/qcursor.h kernel/qcursor_p.h - kernel/qeventpoint.cpp kernel/qeventpoint.h kernel/qeventpoint_p.h kernel/qevent.cpp kernel/qevent.h kernel/qevent_p.h + kernel/qeventpoint.cpp kernel/qeventpoint.h kernel/qeventpoint_p.h kernel/qgenericplugin.cpp kernel/qgenericplugin.h kernel/qgenericpluginfactory.cpp kernel/qgenericpluginfactory.h kernel/qguiapplication.cpp kernel/qguiapplication.h kernel/qguiapplication_p.h diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index a9da13bd31..86a5ab40ac 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -401,11 +401,15 @@ qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND Q qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID LIBRARIES WrapOpenSSL::WrapOpenSSL + PRIVATE_MODULE_INTERFACE + WrapOpenSSL::WrapOpenSSL ) qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked LIBRARIES WrapOpenSSLHeaders::WrapOpenSSLHeaders + PRIVATE_MODULE_INTERFACE + WrapOpenSSLHeaders::WrapOpenSSLHeaders ) qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index a678d3f4a7..feaef0b978 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -401,11 +401,15 @@ qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND Q qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID LIBRARIES WrapOpenSSL::WrapOpenSSL + PRIVATE_MODULE_INTERFACE + WrapOpenSSL::WrapOpenSSL ) qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked LIBRARIES WrapOpenSSLHeaders::WrapOpenSSLHeaders + PRIVATE_MODULE_INTERFACE + WrapOpenSSLHeaders::WrapOpenSSLHeaders ) qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index cd1acc22e2..692ce6d2ff 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -86,8 +86,6 @@ qt_internal_add_plugin(QEglFSIntegrationPlugin qeglfsmain.cpp DEFINES QT_EGL_NO_X11 - INCLUDE_DIRECTORIES - api PUBLIC_LIBRARIES Qt::EglFSDeviceIntegrationPrivate ) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt index 6f1d5f6751..fd0ce77e0b 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt @@ -14,9 +14,6 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin qeglfskmsegldevicescreen.cpp qeglfskmsegldevicescreen.h DEFINES QT_EGL_NO_X11 - INCLUDE_DIRECTORIES - ../../api - ../eglfs_kms_support PUBLIC_LIBRARIES Libdrm::Libdrm Qt::Core diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt index 4afa4fa843..e0e68f2610 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt @@ -15,8 +15,6 @@ qt_internal_add_module(EglFsKmsSupport qeglfskmsscreen.cpp qeglfskmsscreen_p.h DEFINES QT_EGL_NO_X11 - INCLUDE_DIRECTORIES - ../../api PUBLIC_LIBRARIES Libdrm::Libdrm Qt::Core diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt index 526a053b02..f8d89cd1b7 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/.prev_CMakeLists.txt @@ -7,6 +7,7 @@ qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary OUTPUT_NAME qiosnsphotolibrarysupport TYPE platforms/darwin + DEFAULT_IF FALSE SOURCES plugin.mm qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt index 1176e34935..82e5691d10 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt @@ -7,6 +7,7 @@ qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary OUTPUT_NAME qiosnsphotolibrarysupport TYPE platforms/darwin + DEFAULT_IF FALSE SOURCES plugin.mm qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm diff --git a/src/plugins/styles/mac/.prev_CMakeLists.txt b/src/plugins/styles/mac/.prev_CMakeLists.txt new file mode 100644 index 0000000000..4c4e488d91 --- /dev/null +++ b/src/plugins/styles/mac/.prev_CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from mac.pro. + +##################################################################### +## QMacStylePlugin Plugin: +##################################################################### + +qt_internal_add_plugin(QMacStylePlugin + OUTPUT_NAME qmacstyle + TYPE styles + SOURCES + main.mm + qmacstyle_mac.mm qmacstyle_mac_p.h + qmacstyle_mac_p_p.h + LIBRARIES + ${FWAppKit} + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::WidgetsPrivate +) + +#### Keys ignored in scope 1:.:.:mac.pro:<TRUE>: +# DISTFILES = "macstyle.json" diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt index bf93a3958d..1f563c6739 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -42,6 +42,7 @@ qt_internal_add_module(Bootstrap ../../3rdparty/pcre2/src/pcre2_valid_utf.c ../../3rdparty/pcre2/src/pcre2_xclass.c ../../corelib/global/qendian.cpp + ../../corelib/global/qfloat16.cpp ../../corelib/global/qglobal.cpp ../../corelib/global/qlogging.cpp ../../corelib/global/qmalloc.cpp |