diff options
| author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2014-02-26 13:58:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-06 20:48:59 +0100 |
| commit | 15c9fb401316991f4c26ff883c078648614ce6af (patch) | |
| tree | 4e7cbf137aedd74936033700970ec40bd2b751a2 | |
| parent | 6de7a96405f3f2ae5b22a2525b9f65e22ef6e210 (diff) | |
Cocoa/Platformsupport: move qmacmime from cocoa to platformsupport
Share qmacmime with iOS
Change-Id: Ied1b6ed74f2d63ef34d818554827a6165651b6a1
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| -rw-r--r-- | src/platformsupport/clipboard/clipboard.pri | 5 | ||||
| -rw-r--r-- | src/platformsupport/clipboard/qmacmime.mm (renamed from src/plugins/platforms/cocoa/qmacmime.mm) | 2 | ||||
| -rw-r--r-- | src/platformsupport/clipboard/qmacmime_p.h (renamed from src/plugins/platforms/cocoa/qmacmime.h) | 0 | ||||
| -rw-r--r-- | src/platformsupport/platformsupport.pro | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamimetypes.mm | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qmacclipboard.h | 2 |
7 files changed, 9 insertions, 5 deletions
diff --git a/src/platformsupport/clipboard/clipboard.pri b/src/platformsupport/clipboard/clipboard.pri new file mode 100644 index 0000000000..2532430f1e --- /dev/null +++ b/src/platformsupport/clipboard/clipboard.pri @@ -0,0 +1,5 @@ +mac { + HEADERS += $$PWD/qmacmime_p.h + OBJECTIVE_SOURCES += $$PWD/qmacmime.mm +} + diff --git a/src/plugins/platforms/cocoa/qmacmime.mm b/src/platformsupport/clipboard/qmacmime.mm index a9f4c57d6d..adddabb7df 100644 --- a/src/plugins/platforms/cocoa/qmacmime.mm +++ b/src/platformsupport/clipboard/qmacmime.mm @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmacmime.h" +#include "qmacmime_p.h" #include "qguiapplication.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qmacmime.h b/src/platformsupport/clipboard/qmacmime_p.h index 0802987fab..0802987fab 100644 --- a/src/plugins/platforms/cocoa/qmacmime.h +++ b/src/platformsupport/clipboard/qmacmime_p.h diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index f5291ab216..5b4d2b1fb3 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -19,5 +19,6 @@ include(devicediscovery/devicediscovery.pri) include(services/services.pri) include(themes/themes.pri) include(linuxaccessibility/linuxaccessibility.pri) +include(clipboard/clipboard.pri) load(qt_module) diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 505fde9f96..d8cd32255c 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -33,7 +33,6 @@ OBJECTIVE_SOURCES += main.mm \ qcocoaclipboard.mm \ qcocoadrag.mm \ qmacclipboard.mm \ - qmacmime.mm \ qcocoasystemsettings.mm \ qcocoainputcontext.mm \ qcocoaservices.mm \ @@ -71,7 +70,6 @@ HEADERS += qcocoaintegration.h \ qcocoaclipboard.h \ qcocoadrag.h \ qmacclipboard.h \ - qmacmime.h \ qcocoasystemsettings.h \ qcocoainputcontext.h \ qcocoaservices.h \ diff --git a/src/plugins/platforms/cocoa/qcocoamimetypes.mm b/src/plugins/platforms/cocoa/qcocoamimetypes.mm index d3cd0e3b52..05d4c19112 100644 --- a/src/plugins/platforms/cocoa/qcocoamimetypes.mm +++ b/src/plugins/platforms/cocoa/qcocoamimetypes.mm @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qcocoamimetypes.h" -#include "qmacmime.h" +#include <QtPlatformSupport/private/qmacmime_p.h> #include "qcocoahelpers.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qmacclipboard.h b/src/plugins/platforms/cocoa/qmacclipboard.h index d8e588e36b..ddaa61a84d 100644 --- a/src/plugins/platforms/cocoa/qmacclipboard.h +++ b/src/plugins/platforms/cocoa/qmacclipboard.h @@ -43,7 +43,7 @@ #define QMACCLIPBOARD_H #include <QtGui> -#include "qmacmime.h" +#include <QtPlatformSupport/private/qmacmime_p.h> #undef slots |