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 #include #include @@ -2135,7 +2131,6 @@ private: int ct_cursor; QList ct_shifts; AutoCompletionUseSingle use_single; - QPointer 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 #include + QPointer lex; #include "Qsci/qsciabstractapis.h" #include "Qsci/qscicommandset.h" #include "Qsci/qscilexer.h"