diff options
19 files changed, 30 insertions, 64 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index f3ecdde170..024f2ba0fb 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -762,6 +762,14 @@ qt_extend_target(Gui CONDITION WASM qt_extend_target(Gui CONDITION IOS OR MACOS SOURCES + platform/darwin/qmacmime.mm + platform/darwin/qmacmime_p.h + PUBLIC_LIBRARIES + ${FWImageIO} +) + +qt_extend_target(Gui CONDITION IOS OR MACOS + SOURCES rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal_p_p.h PUBLIC_LIBRARIES diff --git a/src/gui/platform/darwin/darwin.pri b/src/gui/platform/darwin/darwin.pri new file mode 100644 index 0000000000..c8d26c997b --- /dev/null +++ b/src/gui/platform/darwin/darwin.pri @@ -0,0 +1,4 @@ +HEADERS += $$PWD/qmacmime_p.h +SOURCES += $$PWD/qmacmime.mm +LIBS += -framework ImageIO +macos: LIBS_PRIVATE += -framework AppKit diff --git a/src/platformsupport/clipboard/qmacmime.mm b/src/gui/platform/darwin/qmacmime.mm index 2679c92f20..60a188f5c5 100644 --- a/src/platformsupport/clipboard/qmacmime.mm +++ b/src/gui/platform/darwin/qmacmime.mm @@ -40,7 +40,10 @@ #include <ImageIO/ImageIO.h> #include <QtCore/qsystemdetection.h> +#include <QtCore/qurl.h> #include <QtGui/qimage.h> +#include <QtCore/qmimedata.h> +#include <QtCore/qstringconverter.h> #if defined(Q_OS_MACOS) #import <AppKit/AppKit.h> diff --git a/src/platformsupport/clipboard/qmacmime_p.h b/src/gui/platform/darwin/qmacmime_p.h index 8b1b6cd10f..3082683834 100644 --- a/src/platformsupport/clipboard/qmacmime_p.h +++ b/src/gui/platform/darwin/qmacmime_p.h @@ -51,14 +51,15 @@ // We mean it. // -#include <QtCore> + +#include <QtGui/private/qtguiglobal_p.h> #include <CoreFoundation/CoreFoundation.h> QT_BEGIN_NAMESPACE // Duplicate of QMacPasteboardMime in QtMacExtras. Keep in sync! -class QMacInternalPasteboardMime { +class Q_GUI_EXPORT QMacInternalPasteboardMime { char type; public: enum QMacPasteboardMimeType { MIME_DND=0x01, @@ -87,10 +88,10 @@ public: virtual int count(QMimeData *mimeData); }; -void qt_mac_addToGlobalMimeList(QMacInternalPasteboardMime *macMime); -void qt_mac_removeFromGlobalMimeList(QMacInternalPasteboardMime *macMime); -void qt_mac_registerDraggedTypes(const QStringList &types); -const QStringList& qt_mac_enabledDraggedTypes(); +Q_GUI_EXPORT void qt_mac_addToGlobalMimeList(QMacInternalPasteboardMime *macMime); +Q_GUI_EXPORT void qt_mac_removeFromGlobalMimeList(QMacInternalPasteboardMime *macMime); +Q_GUI_EXPORT void qt_mac_registerDraggedTypes(const QStringList &types); +Q_GUI_EXPORT const QStringList& qt_mac_enabledDraggedTypes(); QT_END_NAMESPACE diff --git a/src/gui/platform/platform.pri b/src/gui/platform/platform.pri index 1fe2db81b0..be8c752b18 100644 --- a/src/gui/platform/platform.pri +++ b/src/gui/platform/platform.pri @@ -1 +1,2 @@ wasm:include(wasm/wasm.pri) +darwin:include(darwin/darwin.pri) diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index b0110b0db1..186b366f6a 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -41,7 +41,6 @@ if(QT_FEATURE_accessibility AND WIN32 AND NOT WINRT) add_subdirectory(windowsuiautomation) endif() if(APPLE) - add_subdirectory(clipboard) add_subdirectory(graphics) endif() if(QT_FEATURE_vulkan) diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt deleted file mode 100644 index d5b6835a54..0000000000 --- a/src/platformsupport/clipboard/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -# Generated from clipboard.pro. - -##################################################################### -## ClipboardSupport Module: -##################################################################### - -qt_add_module(ClipboardSupport - STATIC - INTERNAL_MODULE - SOURCES - qmacmime.mm qmacmime_p.h - DEFINES - QT_NO_CAST_FROM_ASCII - PUBLIC_LIBRARIES - ${FWImageIO} - Qt::CorePrivate - Qt::Gui -) - -#### Keys ignored in scope 1:.:.:clipboard.pro:<TRUE>: -# MODULE = "clipboard_support" - -## Scopes: -##################################################################### - -qt_extend_target(ClipboardSupport CONDITION MACOS - LIBRARIES - ${FWAppKit} -) diff --git a/src/platformsupport/clipboard/clipboard.pro b/src/platformsupport/clipboard/clipboard.pro deleted file mode 100644 index 916f6b0c06..0000000000 --- a/src/platformsupport/clipboard/clipboard.pro +++ /dev/null @@ -1,15 +0,0 @@ -TARGET = QtClipboardSupport -MODULE = clipboard_support - -QT = core-private gui -CONFIG += static internal_module - -DEFINES += QT_NO_CAST_FROM_ASCII - -HEADERS += qmacmime_p.h -SOURCES += qmacmime.mm - -LIBS += -framework ImageIO -macos: LIBS_PRIVATE += -framework AppKit - -load(qt_module) diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 4b41b29c12..98b92b47b1 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -39,7 +39,6 @@ qtConfig(accessibility) { darwin { SUBDIRS += \ - clipboard \ graphics } diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 9151ad4d3f..a977a5af67 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -56,7 +56,6 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin ${FWMetal} ${FWQuartzCore} Cups::Cups - Qt::ClipboardSupportPrivate Qt::Core Qt::CorePrivate Qt::FontDatabaseSupportPrivate diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 1d1089a634..23cee0d7a3 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -96,7 +96,7 @@ DEFINES += QT_NO_FOREACH QT += \ core-private gui-private \ - clipboard_support-private theme_support-private \ + theme_support-private \ fontdatabase_support-private graphics_support-private qtConfig(vulkan): QT += vulkan_support-private diff --git a/src/plugins/platforms/cocoa/qcocoamimetypes.mm b/src/plugins/platforms/cocoa/qcocoamimetypes.mm index f7662a92a4..6b88def642 100644 --- a/src/plugins/platforms/cocoa/qcocoamimetypes.mm +++ b/src/plugins/platforms/cocoa/qcocoamimetypes.mm @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qcocoamimetypes.h" -#include <QtClipboardSupport/private/qmacmime_p.h> +#include <QtGui/private/qmacmime_p.h> #include "qcocoahelpers.h" #include <QtGui/private/qcoregraphics_p.h> diff --git a/src/plugins/platforms/cocoa/qmacclipboard.h b/src/plugins/platforms/cocoa/qmacclipboard.h index f2f460c048..40441d924c 100644 --- a/src/plugins/platforms/cocoa/qmacclipboard.h +++ b/src/plugins/platforms/cocoa/qmacclipboard.h @@ -41,7 +41,7 @@ #define QMACCLIPBOARD_H #include <QtGui> -#include <QtClipboardSupport/private/qmacmime_p.h> +#include <QtGui/private/qmacmime_p.h> #import <AppKit/AppKit.h> diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index 24a93677a2..caebda2a10 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -31,7 +31,6 @@ add_qt_plugin(QIOSIntegrationPlugin ${FWFoundation} ${FWQuartzCore} ${FWUIKit} - Qt::ClipboardSupportPrivate Qt::Core Qt::CorePrivate Qt::FontDatabaseSupportPrivate diff --git a/src/plugins/platforms/ios/kernel.pro b/src/plugins/platforms/ios/kernel.pro index c483076856..0bea8f0cd9 100644 --- a/src/plugins/platforms/ios/kernel.pro +++ b/src/plugins/platforms/ios/kernel.pro @@ -7,7 +7,7 @@ qtConfig(shared): CONFIG += static QT += \ core-private gui-private \ - clipboard_support-private fontdatabase_support-private graphics_support-private + fontdatabase_support-private graphics_support-private qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private diff --git a/src/plugins/platforms/ios/qiosclipboard.mm b/src/plugins/platforms/ios/qiosclipboard.mm index 6bdbf94d3f..236ca843d8 100644 --- a/src/plugins/platforms/ios/qiosclipboard.mm +++ b/src/plugins/platforms/ios/qiosclipboard.mm @@ -41,7 +41,8 @@ #ifndef QT_NO_CLIPBOARD -#include <QtClipboardSupport/private/qmacmime_p.h> +#include <QtCore/qurl.h> +#include <QtGui/private/qmacmime_p.h> #include <QtCore/QMimeData> #include <QtGui/QGuiApplication> diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index e7a548743e..e9046151f5 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -60,7 +60,7 @@ #include <qpa/qplatformoffscreensurface.h> #include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h> -#include <QtClipboardSupport/private/qmacmime_p.h> +#include <QtGui/private/qmacmime_p.h> #include <QDir> #include <QOperatingSystemVersion> diff --git a/sync.profile b/sync.profile index 1a567c3059..36acdbed5e 100644 --- a/sync.profile +++ b/sync.profile @@ -14,7 +14,6 @@ "QtAccessibilitySupport" => "$basedir/src/platformsupport/accessibility", "QtWindowsUIAutomationSupport" => "$basedir/src/platformsupport/windowsuiautomation", "QtLinuxAccessibilitySupport" => "$basedir/src/platformsupport/linuxaccessibility", - "QtClipboardSupport" => "$basedir/src/platformsupport/clipboard", "QtDeviceDiscoverySupport" => "$basedir/src/platformsupport/devicediscovery", "QtEventDispatcherSupport" => "$basedir/src/platformsupport/eventdispatchers", "QtFontDatabaseSupport" => "$basedir/src/platformsupport/fontdatabases", diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 4930b0d1a2..bd37e39f8f 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -96,9 +96,6 @@ _qt_library_map = [ LibraryMapping("bootstrap", "Qt6", "Qt::Bootstrap", extra=["COMPONENTS", "Bootstrap"]), # bootstrap-dbus: Not needed in Qt6! LibraryMapping("client", "Qt6", "Qt::WaylandClient", extra=["COMPONENTS", "WaylandClient"]), - LibraryMapping( - "clipboard_support", "Qt6", "Qt::ClipboardSupport", extra=["COMPONENTS", "ClipboardSupport"] - ), LibraryMapping("coap", "Qt6", "Qt::Coap", extra=["COMPONENTS", "Coap"]), LibraryMapping("common-lib", "Qt6", "Qt::AppManCommon", extra=["COMPONENTS", "AppManCommon"]), LibraryMapping( |