aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEditBase/ScintillaQt.cpp
diff options
context:
space:
mode:
authorNeil Hodgson <nyamatongwe@gmail.com>2013-08-11 22:36:04 +1000
committerNeil Hodgson <nyamatongwe@gmail.com>2013-08-11 22:36:04 +1000
commitae6923ec7059150408b15ced63f9645c1ec7781a (patch)
treec9e458de0169cb54a7bd2b81d6e58a0af77896f8 /qt/ScintillaEditBase/ScintillaQt.cpp
parenta80b138280d6fa379fb2f3c1cd28495f49ae07e5 (diff)
downloadscintilla-mirror-ae6923ec7059150408b15ced63f9645c1ec7781a.tar.gz
Avoid QMacPasteboardMime on Qt >= 5.0 since it is not implemented yet.
Means rectangular clipboard operations will not work.
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaQt.cpp')
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index 66beaed92..009654df2 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -73,7 +73,7 @@ static const QString sScintillaRecMimeType("text/x-scintilla.utf16-plain-text.re
static const QString sMimeRectangularMarker("text/x-rectangular-marker");
#endif
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC) && QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
class ScintillaRectangularMime : public QMacPasteboardMime {
public:
@@ -132,7 +132,7 @@ void ScintillaQt::Initialise()
rectangularSelectionModifier = SCMOD_CTRL;
#endif
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC) && QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
if (!singletonMime) {
singletonMime = new ScintillaRectangularMime();