Fix static builds on Mac.

QMacPasteboardMime is a public class in Qt 4. Qt 5 has
two copies, one public QtMacExtras and an internal
one in the cocoa plugin. This causes a symbol collision
when building statically.

Rename the internal copy to QMacInternalPasteboardMime.

Task-number: QTBUG-35310
Change-Id: I891787b451a0b342ed85aa7196e606bc11623e21
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/platforms/cocoa/qmacmime.h b/src/plugins/platforms/cocoa/qmacmime.h
index d9ef63ae48..0802987fab 100644
--- a/src/plugins/platforms/cocoa/qmacmime.h
+++ b/src/plugins/platforms/cocoa/qmacmime.h
@@ -49,7 +49,7 @@
 QT_BEGIN_NAMESPACE
 
 // Duplicate of QMacPasteboardMime in QtMacExtras. Keep in sync!
-class QMacPasteboardMime {
+class QMacInternalPasteboardMime {
     char type;
 public:
     enum QMacPasteboardMimeType { MIME_DND=0x01,
@@ -58,14 +58,14 @@ public:
         MIME_QT3_CONVERTOR=0x08,
         MIME_ALL=MIME_DND|MIME_CLIP
     };
-    explicit QMacPasteboardMime(char);
-    virtual ~QMacPasteboardMime();
+    explicit QMacInternalPasteboardMime(char);
+    virtual ~QMacInternalPasteboardMime();
 
     static void initializeMimeTypes();
     static void destroyMimeTypes();
 
-    static QList<QMacPasteboardMime*> all(uchar);
-    static QMacPasteboardMime *convertor(uchar, const QString &mime, QString flav);
+    static QList<QMacInternalPasteboardMime*> all(uchar);
+    static QMacInternalPasteboardMime *convertor(uchar, const QString &mime, QString flav);
     static QString flavorToMime(uchar, QString flav);
 
     virtual QString convertorName() = 0;
@@ -78,8 +78,8 @@ public:
     virtual int count(QMimeData *mimeData);
 };
 
-void qt_mac_addToGlobalMimeList(QMacPasteboardMime *macMime);
-void qt_mac_removeFromGlobalMimeList(QMacPasteboardMime *macMime);
+void qt_mac_addToGlobalMimeList(QMacInternalPasteboardMime *macMime);
+void qt_mac_removeFromGlobalMimeList(QMacInternalPasteboardMime *macMime);
 void qt_mac_registerDraggedTypes(const QStringList &types);
 const QStringList& qt_mac_enabledDraggedTypes();