diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-31 12:25:11 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-21 13:21:53 +0200 |
| commit | 42024666a37ad0e8b5c557a2fd901779f63d1fcb (patch) | |
| tree | 5b5e786aca006db30b36479e0e573035c919293b /src/plugins/platforms/ios | |
| parent | 9bad3508fccb058261d47e023400868147f2d733 (diff) | |
Move QMacInternalPasteboardMime to QtGui
Task-number: QTBUG-83255
Change-Id: I00fda24479ad2c04781c5fefaa15fac1118033a8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios')
| -rw-r--r-- | src/plugins/platforms/ios/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/kernel.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiosclipboard.mm | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 2 |
4 files changed, 4 insertions, 4 deletions
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> |