From 969e263e5bf71e63df8ee908cb4a2014b9a55c9b Mon Sep 17 00:00:00 2001
From: ilovezfs <ilovezfs@icloud.com>
Date: Fri, 7 Oct 2016 12:10:55 +0100
Subject: [PATCH] Xcode 8 fix for QScintilla2

---
 libs/qscintilla/Qt4Qt5/Qsci/qsciscintilla.h | 9 ---------
 libs/qscintilla/Qt4Qt5/qsciscintilla.cpp    | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/libs/qscintilla/Qt4Qt5/Qsci/qsciscintilla.h b/libs/qscintilla/Qt4Qt5/Qsci/qsciscintilla.h
index c0faa9b6..746b4992 100644
--- a/libs/qscintilla/Qt4Qt5/Qsci/qsciscintilla.h
+++ b/libs/qscintilla/Qt4Qt5/Qsci/qsciscintilla.h
@@ -22,10 +22,6 @@
 #ifndef QSCISCINTILLA_H
 #define QSCISCINTILLA_H
 
-#ifdef __APPLE__
-extern "C++" {
-#endif
-
 #include <QByteArray>
 #include <QList>
 #include <QObject>
@@ -2135,7 +2131,6 @@ private:
     int ct_cursor;
     QList<int> ct_shifts;
     AutoCompletionUseSingle use_single;
-    QPointer<QsciLexer> lex;
     QsciCommandSet *stdCmds;
     QsciDocument doc;
     QColor nl_text_colour;
@@ -2157,8 +2152,4 @@ private:
     QsciScintilla &operator=(const QsciScintilla &);
 };
 
-#ifdef __APPLE__
-}
-#endif
-
 #endif
diff --git a/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp b/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp
index 92ebb0cb..330e9eeb 100644
--- a/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp
+++ b/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp
@@ -35,6 +35,7 @@
 #include <QMenu>
 #include <QPoint>
 
+    QPointer<QsciLexer> lex;
 #include "Qsci/qsciabstractapis.h"
 #include "Qsci/qscicommandset.h"
 #include "Qsci/qscilexer.h"