From 8df553058b76818d13bca8ec2fc7fc83d147dca8 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 10 Aug 2013 12:43:55 +1000 Subject: Backed out change #4739 for Qt 5 on OS X as the code was LGPL. --- qt/ScintillaEditBase/ScintillaQt.cpp | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'qt/ScintillaEditBase/ScintillaQt.cpp') diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index b1e6221e7..66beaed92 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -75,30 +75,6 @@ static const QString sMimeRectangularMarker("text/x-rectangular-marker"); #ifdef Q_OS_MAC -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - -class QMacPasteboardMime; -typedef QList MimeList; -Q_GLOBAL_STATIC(MimeList, globalMimeList) - -QMacPasteboardMime::QMacPasteboardMime(char t) : type(t) -{ - globalMimeList()->append(this); -} - -QMacPasteboardMime::~QMacPasteboardMime() -{ - if(!QApplication::closingDown()) - globalMimeList()->removeAll(this); -} - -Q_GLOBAL_STATIC(QStringList, globalDraggedTypesList) -void qRegisterDraggedTypes(const QStringList &types) -{ - (*globalDraggedTypesList()) += types; -} -#endif - class ScintillaRectangularMime : public QMacPasteboardMime { public: ScintillaRectangularMime() : QMacPasteboardMime(MIME_ALL) { -- cgit v1.2.3