diff options
author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-12-18 12:21:21 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-18 20:28:37 +0100 |
commit | c8d696eee7d26cb78a75f1476b7ac1b0c2c8f3c5 (patch) | |
tree | ca3ced3ca6f1642ed4c4ec690ac30ffbe8a77cb0 /src/plugins/platforms/cocoa/qmacclipboard.h | |
parent | ce9ece3b56d45b00bbca14042fe4d60df35de191 (diff) |
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>
Diffstat (limited to 'src/plugins/platforms/cocoa/qmacclipboard.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qmacclipboard.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qmacclipboard.h b/src/plugins/platforms/cocoa/qmacclipboard.h index 4eeeecc0c0..d8e588e36b 100644 --- a/src/plugins/platforms/cocoa/qmacclipboard.h +++ b/src/plugins/platforms/cocoa/qmacclipboard.h @@ -55,9 +55,9 @@ class QMacPasteboard { struct Promise { Promise() : itemId(0), convertor(0) { } - Promise(int itemId, QMacPasteboardMime *c, QString m, QVariant d, int o=0) : itemId(itemId), offset(o), convertor(c), mime(m), data(d) { } + Promise(int itemId, QMacInternalPasteboardMime *c, QString m, QVariant d, int o=0) : itemId(itemId), offset(o), convertor(c), mime(m), data(d) { } int itemId, offset; - QMacPasteboardMime *convertor; + QMacInternalPasteboardMime *convertor; QString mime; QVariant data; }; |