mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 11:00:44 -06:00
Code Issues Packages Projects Releases Wiki Activity
Files
30d0b183a56e55296e19a4347548cf5907cc24e8
sqlitebrowser/libs/DB4S_PATCH_05
mgrojo 17827ce5be Update QScintilla patches for version 2.10.8 
Delete patches that have already been applied upstream and add new ones
for build related files that were not registered.

See commits:
209120c01e
43134caa2d

and issue #1621
2018-11-21 20:30:59 +01:00

364 lines
9.1 KiB
Plaintext
Raw Blame History

--- QScintilla_gpl-2.10.8/Qt4Qt5/qscintilla.pro 2018-10-01 15:46:06.000000000 +0200
+++ qscintilla/Qt4Qt5/qscintilla.pro 2018-11-21 19:51:25.870248673 +0100
@@ -23,24 +23,12 @@
!win32:VERSION = 13.2.1
TEMPLATE = lib
-CONFIG += qt warn_off thread exceptions hide_symbols
-
-CONFIG(debug, debug|release) {
- mac: {
- TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}_debug
- } else {
- win32: {
- TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}d
- } else {
- TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
- }
- }
-} else {
- TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
-}
-
+TARGET = qscintilla2
+CONFIG += qt warn_off thread exceptions hide_symbols staticlib debug_and_release
INCLUDEPATH += . ../include ../lexlib ../src
+QMAKE_CXXFLAGS += -std=c++11
+
!CONFIG(staticlib) {
DEFINES += QSCINTILLA_MAKE_DLL
}
@@ -59,11 +47,6 @@
DEFINES += QT_NO_ACCESSIBILITY
}
-# For old versions of GCC.
-unix:!macx {
- CONFIG += c++11
-}
-
# Comment this in if you want the internal Scintilla classes to be placed in a
# Scintilla namespace rather than pollute the global namespace.
#DEFINES += SCI_NAMESPACE
@@ -97,69 +80,20 @@
HEADERS = \
./Qsci/qsciglobal.h \
- ./Qsci/qsciscintilla.h \
- ./Qsci/qsciscintillabase.h \
- ./Qsci/qsciabstractapis.h \
- ./Qsci/qsciapis.h \
./Qsci/qscicommand.h \
./Qsci/qscicommandset.h \
./Qsci/qscidocument.h \
- ./Qsci/qscilexer.h \
- ./Qsci/qscilexeravs.h \
- ./Qsci/qscilexerbash.h \
- ./Qsci/qscilexerbatch.h \
- ./Qsci/qscilexercmake.h \
- ./Qsci/qscilexercoffeescript.h \
- ./Qsci/qscilexercpp.h \
- ./Qsci/qscilexercsharp.h \
- ./Qsci/qscilexercss.h \
- ./Qsci/qscilexercustom.h \
- ./Qsci/qscilexerd.h \
- ./Qsci/qscilexerdiff.h \
- ./Qsci/qscilexeredifact.h \
- ./Qsci/qscilexerfortran.h \
- ./Qsci/qscilexerfortran77.h \
- ./Qsci/qscilexerhtml.h \
- ./Qsci/qscilexeridl.h \
- ./Qsci/qscilexerjava.h \
- ./Qsci/qscilexerjavascript.h \
- ./Qsci/qscilexerjson.h \
- ./Qsci/qscilexerlua.h \
- ./Qsci/qscilexermakefile.h \
- ./Qsci/qscilexermarkdown.h \
- ./Qsci/qscilexermatlab.h \
- ./Qsci/qscilexeroctave.h \
- ./Qsci/qscilexerpascal.h \
- ./Qsci/qscilexerperl.h \
- ./Qsci/qscilexerpostscript.h \
- ./Qsci/qscilexerpo.h \
- ./Qsci/qscilexerpov.h \
- ./Qsci/qscilexerproperties.h \
- ./Qsci/qscilexerpython.h \
- ./Qsci/qscilexerruby.h \
- ./Qsci/qscilexerspice.h \
- ./Qsci/qscilexersql.h \
- ./Qsci/qscilexertcl.h \
- ./Qsci/qscilexertex.h \
- ./Qsci/qscilexerverilog.h \
- ./Qsci/qscilexervhdl.h \
- ./Qsci/qscilexerxml.h \
- ./Qsci/qscilexeryaml.h \
- ./Qsci/qscimacro.h \
./Qsci/qsciprinter.h \
./Qsci/qscistyle.h \
./Qsci/qscistyledtext.h \
ListBoxQt.h \
- SciAccessibility.h \
- SciClasses.h \
SciNamespace.h \
- ScintillaQt.h \
../include/ILexer.h \
../include/Platform.h \
- ../include/Sci_Position.h \
../include/SciLexer.h \
../include/Scintilla.h \
../include/ScintillaWidget.h \
+ ../include/Sci_Position.h \
../lexlib/Accessor.h \
../lexlib/CharacterCategory.h \
../lexlib/CharacterSet.h \
@@ -170,7 +104,6 @@
../lexlib/LexerSimple.h \
../lexlib/OptionSet.h \
../lexlib/PropSetSimple.h \
- ../lexlib/StringCopy.h \
../lexlib/StyleContext.h \
../lexlib/SubStyles.h \
../lexlib/WordList.h \
@@ -184,15 +117,12 @@
../src/ContractionState.h \
../src/Decoration.h \
../src/Document.h \
- ../src/EditModel.h \
../src/Editor.h \
- ../src/EditView.h \
../src/ExternalLexer.h \
../src/FontQuality.h \
../src/Indicator.h \
../src/KeyMap.h \
../src/LineMarker.h \
- ../src/MarginView.h \
../src/Partitioning.h \
../src/PerLine.h \
../src/PositionCache.h \
@@ -205,7 +135,26 @@
../src/UnicodeFromUTF8.h \
../src/UniConversion.h \
../src/ViewStyle.h \
- ../src/XPM.h
+ ../src/XPM.h \
+ ../src/Position.h \
+ ../src/SparseVector.h \
+ ./Qsci/qsciscintilla.h \
+ ./Qsci/qsciscintillabase.h \
+ ./Qsci/qsciabstractapis.h \
+ ./Qsci/qsciapis.h \
+ ./Qsci/qscilexer.h \
+ ./Qsci/qscilexercustom.h \
+ ./Qsci/qscilexersql.h \
+ ./Qsci/qscilexerjson.h \
+ ./Qsci/qscilexerhtml.h \
+ ./Qsci/qscilexerxml.h \
+ ./Qsci/qscilexerjavascript.h \
+ ./Qsci/qscilexercpp.h \
+ ./Qsci/qscilexerpython.h \
+ ./Qsci/qscimacro.h \
+ SciClasses.h \
+ ScintillaQt.h \
+ SciAccessibility.h
SOURCES = \
qsciscintilla.cpp \
@@ -216,161 +165,28 @@
qscicommandset.cpp \
qscidocument.cpp \
qscilexer.cpp \
- qscilexeravs.cpp \
- qscilexerbash.cpp \
- qscilexerbatch.cpp \
- qscilexercmake.cpp \
- qscilexercoffeescript.cpp \
- qscilexercpp.cpp \
- qscilexercsharp.cpp \
- qscilexercss.cpp \
qscilexercustom.cpp \
- qscilexerd.cpp \
- qscilexerdiff.cpp \
- qscilexeredifact.cpp \
- qscilexerfortran.cpp \
- qscilexerfortran77.cpp \
+ qscilexersql.cpp \
+ qscilexerjson.cpp \
qscilexerhtml.cpp \
- qscilexeridl.cpp \
- qscilexerjava.cpp \
+ qscilexerxml.cpp \
qscilexerjavascript.cpp \
- qscilexerjson.cpp \
- qscilexerlua.cpp \
- qscilexermakefile.cpp \
- qscilexermarkdown.cpp \
- qscilexermatlab.cpp \
- qscilexeroctave.cpp \
- qscilexerpascal.cpp \
- qscilexerperl.cpp \
- qscilexerpostscript.cpp \
- qscilexerpo.cpp \
- qscilexerpov.cpp \
- qscilexerproperties.cpp \
+ qscilexercpp.cpp \
qscilexerpython.cpp \
- qscilexerruby.cpp \
- qscilexerspice.cpp \
- qscilexersql.cpp \
- qscilexertcl.cpp \
- qscilexertex.cpp \
- qscilexerverilog.cpp \
- qscilexervhdl.cpp \
- qscilexerxml.cpp \
- qscilexeryaml.cpp \
qscimacro.cpp \
qsciprinter.cpp \
qscistyle.cpp \
qscistyledtext.cpp \
- MacPasteboardMime.cpp \
- InputMethod.cpp \
- SciAccessibility.cpp \
+ MacPasteboardMime.cpp \
+ InputMethod.cpp \
SciClasses.cpp \
ListBoxQt.cpp \
PlatQt.cpp \
ScintillaQt.cpp \
- ../lexers/LexA68k.cpp \
- ../lexers/LexAbaqus.cpp \
- ../lexers/LexAda.cpp \
- ../lexers/LexAPDL.cpp \
- ../lexers/LexAsm.cpp \
- ../lexers/LexAsn1.cpp \
- ../lexers/LexASY.cpp \
- ../lexers/LexAU3.cpp \
- ../lexers/LexAVE.cpp \
- ../lexers/LexAVS.cpp \
- ../lexers/LexBaan.cpp \
- ../lexers/LexBash.cpp \
- ../lexers/LexBasic.cpp \
- ../lexers/LexBatch.cpp \
- ../lexers/LexBibTeX.cpp \
- ../lexers/LexBullant.cpp \
- ../lexers/LexCaml.cpp \
- ../lexers/LexCLW.cpp \
- ../lexers/LexCmake.cpp \
- ../lexers/LexCOBOL.cpp \
- ../lexers/LexCoffeeScript.cpp \
- ../lexers/LexConf.cpp \
- ../lexers/LexCPP.cpp \
- ../lexers/LexCrontab.cpp \
- ../lexers/LexCsound.cpp \
- ../lexers/LexCSS.cpp \
- ../lexers/LexD.cpp \
- ../lexers/LexDiff.cpp \
- ../lexers/LexDMAP.cpp \
- ../lexers/LexDMIS.cpp \
- ../lexers/LexECL.cpp \
- ../lexers/LexEDIFACT.cpp \
- ../lexers/LexEiffel.cpp \
- ../lexers/LexErlang.cpp \
- ../lexers/LexErrorList.cpp \
- ../lexers/LexEScript.cpp \
- ../lexers/LexFlagship.cpp \
- ../lexers/LexForth.cpp \
- ../lexers/LexFortran.cpp \
- ../lexers/LexGAP.cpp \
- ../lexers/LexGui4Cli.cpp \
- ../lexers/LexHaskell.cpp \
- ../lexers/LexHex.cpp \
- ../lexers/LexHTML.cpp \
- ../lexers/LexInno.cpp \
- ../lexers/LexJSON.cpp \
- ../lexers/LexKix.cpp \
- ../lexers/LexKVIrc.cpp \
- ../lexers/LexLaTeX.cpp \
- ../lexers/LexLisp.cpp \
- ../lexers/LexLout.cpp \
- ../lexers/LexLua.cpp \
- ../lexers/LexMagik.cpp \
- ../lexers/LexMake.cpp \
- ../lexers/LexMarkdown.cpp \
- ../lexers/LexMatlab.cpp \
- ../lexers/LexMetapost.cpp \
- ../lexers/LexMMIXAL.cpp \
- ../lexers/LexModula.cpp \
- ../lexers/LexMPT.cpp \
- ../lexers/LexMSSQL.cpp \
- ../lexers/LexMySQL.cpp \
- ../lexers/LexNimrod.cpp \
- ../lexers/LexNsis.cpp \
- ../lexers/LexNull.cpp \
- ../lexers/LexOpal.cpp \
- ../lexers/LexOScript.cpp \
- ../lexers/LexPascal.cpp \
- ../lexers/LexPB.cpp \
- ../lexers/LexPerl.cpp \
- ../lexers/LexPLM.cpp \
- ../lexers/LexPO.cpp \
- ../lexers/LexPOV.cpp \
- ../lexers/LexPowerPro.cpp \
- ../lexers/LexPowerShell.cpp \
- ../lexers/LexProgress.cpp \
- ../lexers/LexProps.cpp \
- ../lexers/LexPS.cpp \
- ../lexers/LexPython.cpp \
- ../lexers/LexR.cpp \
- ../lexers/LexRebol.cpp \
- ../lexers/LexRegistry.cpp \
- ../lexers/LexRuby.cpp \
- ../lexers/LexRust.cpp \
- ../lexers/LexScriptol.cpp \
- ../lexers/LexSmalltalk.cpp \
- ../lexers/LexSML.cpp \
- ../lexers/LexSorcus.cpp \
- ../lexers/LexSpecman.cpp \
- ../lexers/LexSpice.cpp \
+ SciAccessibility.cpp \
../lexers/LexSQL.cpp \
- ../lexers/LexSTTXT.cpp \
- ../lexers/LexTACL.cpp \
- ../lexers/LexTADS3.cpp \
- ../lexers/LexTAL.cpp \
- ../lexers/LexTCL.cpp \
- ../lexers/LexTCMD.cpp \
- ../lexers/LexTeX.cpp \
- ../lexers/LexTxt2tags.cpp \
- ../lexers/LexVB.cpp \
- ../lexers/LexVerilog.cpp \
- ../lexers/LexVHDL.cpp \
- ../lexers/LexVisualProlog.cpp \
- ../lexers/LexYAML.cpp \
+ ../lexers/LexJSON.cpp \
+ ../lexers/LexHTML.cpp \
../lexlib/Accessor.cpp \
../lexlib/CharacterCategory.cpp \
../lexlib/CharacterSet.cpp \
@@ -391,20 +207,20 @@
../src/ContractionState.cpp \
../src/Decoration.cpp \
../src/Document.cpp \
- ../src/EditModel.cpp \
../src/Editor.cpp \
+ ../src/EditModel.cpp \
../src/EditView.cpp \
../src/ExternalLexer.cpp \
../src/Indicator.cpp \
- ../src/KeyMap.cpp \
+ ../src/KeyMap.cpp \
../src/LineMarker.cpp \
../src/MarginView.cpp \
../src/PerLine.cpp \
../src/PositionCache.cpp \
- ../src/RESearch.cpp \
+ ../src/RESearch.cpp \
../src/RunStyles.cpp \
- ../src/ScintillaBase.cpp \
- ../src/Selection.cpp \
+ ../src/ScintillaBase.cpp \
+ ../src/Selection.cpp \
../src/Style.cpp \
../src/UniConversion.cpp \
../src/ViewStyle.cpp \
Reference in New Issue View Git Blame Copy Permalink