diff --git a/.gitignore b/.gitignore index b97aadd9..8bb20187 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,4 @@ doc/build *.qm qscintilla_*.ts *.rc - +_build diff --git a/src/gui/AboutDialogs.h b/src/gui/AboutDialogs.h index f7f3cf35..fc208f6d 100644 --- a/src/gui/AboutDialogs.h +++ b/src/gui/AboutDialogs.h @@ -21,6 +21,7 @@ #include using namespace cpr::core; +#include #include #include #include diff --git a/src/plugins/ncl-textual-view/deps/QScintilla_gpl-2.10.1/Qt4Qt5/CMakeLists.txt b/src/plugins/ncl-textual-view/deps/QScintilla_gpl-2.10.1/Qt4Qt5/CMakeLists.txt index 442d7f26..ff06f63c 100644 --- a/src/plugins/ncl-textual-view/deps/QScintilla_gpl-2.10.1/Qt4Qt5/CMakeLists.txt +++ b/src/plugins/ncl-textual-view/deps/QScintilla_gpl-2.10.1/Qt4Qt5/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required (VERSION 3.2) project(qscintilla2_telem) -set (CMAKE_AUTOMOC ON) +set (CMAKE_AUTOMOC OFF) set (CMAKE_AUTORCC ON) set (CMAKE_INCLUDE_CURRENT_DIR ON) @@ -23,7 +23,7 @@ set (QSCINTILLA_SOURCES ./Qsci/qscicommandset.h ./Qsci/qscidocument.h ./Qsci/qscilexer.h - + ./Qsci/qscilexercustom.h ./Qsci/qscilexercpp.h ./Qsci/qscilexerpython.h @@ -31,7 +31,7 @@ set (QSCINTILLA_SOURCES ./Qsci/qscilexerhtml.h ./Qsci/qscilexerxml.h ./Qsci/qscilexerlua.h - + ./Qsci/qscimacro.h ./Qsci/qsciprinter.h ./Qsci/qscistyle.h @@ -91,7 +91,7 @@ set (QSCINTILLA_SOURCES ../src/UniConversion.h ../src/ViewStyle.h ../src/XPM.h - + qsciscintilla.cpp qsciscintillabase.cpp qsciabstractapis.cpp @@ -100,7 +100,7 @@ set (QSCINTILLA_SOURCES qscicommandset.cpp qscidocument.cpp qscilexer.cpp - + qscilexercustom.cpp qscilexercpp.cpp qscilexerpython.cpp @@ -108,7 +108,7 @@ set (QSCINTILLA_SOURCES qscilexerhtml.cpp qscilexerxml.cpp qscilexerlua.cpp - + qscimacro.cpp qsciprinter.cpp qscistyle.cpp @@ -119,12 +119,12 @@ set (QSCINTILLA_SOURCES ListBoxQt.cpp PlatQt.cpp ScintillaQt.cpp - + ../lexers/LexPython.cpp ../lexers/LexCPP.cpp ../lexers/LexHTML.cpp ../lexers/LexLua.cpp - + ../lexlib/Accessor.cpp ../lexlib/CharacterCategory.cpp ../lexlib/CharacterSet.cpp diff --git a/src/plugins/ncl-textual-view/deps/QScintilla_gpl-2.10.1/Qt4Qt5/qscintilla.pro b/src/plugins/ncl-textual-view/deps/QScintilla_gpl-2.10.1/Qt4Qt5/qscintilla.pro index 103df65a..6465d1d8 100644 --- a/src/plugins/ncl-textual-view/deps/QScintilla_gpl-2.10.1/Qt4Qt5/qscintilla.pro +++ b/src/plugins/ncl-textual-view/deps/QScintilla_gpl-2.10.1/Qt4Qt5/qscintilla.pro @@ -1,19 +1,19 @@ # The project file for the QScintilla library. # # Copyright (c) 2017 Riverbank Computing Limited -# +# # This file is part of QScintilla. -# +# # This file may be used under the terms of the GNU General Public License # version 3.0 as published by the Free Software Foundation and appearing in # the file LICENSE included in the packaging of this file. Please review the # following information to ensure the GNU General Public License version 3.0 # requirements will be met: http://www.gnu.org/copyleft/gpl.html. -# +# # If you do not wish to use this file under the terms of the GPL version 3.0 # then you may purchase a commercial license. For more information contact # info@riverbankcomputing.com. -# +# # This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -495,6 +495,7 @@ contains(ALL_LEXERS, true) { ../src/UniConversion.cpp \ ../src/ViewStyle.cpp \ ../src/XPM.cpp +} TRANSLATIONS = \ qscintilla_cs.ts \