New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1

1 files changed, 23 insertions, 33 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro
index 3eba953..bcd8148 100644
--- a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro
+++ b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro
@@ -17,14 +17,17 @@ QT       += script network
 TARGET = coreSQLiteStudio

 TEMPLATE = lib

 

-win32 {

+win32: {

     LIBS += -lpsapi -limagehlp

-

-    THE_FILE = $$PWD/qt.conf

-    THE_DEST = $${DESTDIR}

-    THE_FILE ~= s,/,\\,g

-    THE_DEST ~= s,/,\\,g

-    QMAKE_POST_LINK += $$QMAKE_COPY $$THE_FILE $$THE_DEST $$escape_expand(\\n\\t)

+    DEFINES += "SQLITE_API=\"__declspec(dllexport)\""

+

+    !debug: {

+        THE_FILE = $$PWD/qt.conf

+        THE_DEST = $${DESTDIR}

+        THE_FILE ~= s,/,\\,g

+        THE_DEST ~= s,/,\\,g

+        QMAKE_POST_LINK += $$QMAKE_COPY $$THE_FILE $$THE_DEST $$escape_expand(\\n\\t)

+    }

 }

 

 linux: {

@@ -37,7 +40,7 @@ linux: {
 macx: {

     out_file = $$DESTDIR/lib $$TARGET .dylib

     QMAKE_POST_LINK += install_name_tool -change libsqlite3.dylib @loader_path/../Frameworks/libsqlite3.dylib $$join(out_file)

-    QMAKE_POST_LINK += ; $$QMAKE_MKDIR $$DESTDIR/SQLiteStudio.app

+    QMAKE_POST_LINK += $$QMAKE_MKDIR $$DESTDIR/SQLiteStudio.app

     QMAKE_POST_LINK += ; $$QMAKE_MKDIR $$DESTDIR/SQLiteStudio.app/Contents

     QMAKE_POST_LINK += ; $$QMAKE_COPY $$PWD/Info.plist $$DESTDIR/SQLiteStudio.app/Contents

     LIBS += -L/usr/local/lib

@@ -51,7 +54,7 @@ portable {
     DEFINES += PORTABLE_CONFIG

 }

 

-CONFIG   += c++11

+CONFIG  += c++17

 QMAKE_CXXFLAGS += -pedantic

 

 TRANSLATIONS += translations/coreSQLiteStudio_ro_RO.ts \

@@ -66,6 +69,11 @@ TRANSLATIONS += translations/coreSQLiteStudio_ro_RO.ts \
 		translations/coreSQLiteStudio_pl.ts

 

 SOURCES += sqlitestudio.cpp \

+    common/compatibility.cpp \

+    db/queryexecutorsteps/queryexecutorcolumntype.cpp \

+    parser/ast/sqlitefilterover.cpp \

+    parser/ast/sqlitenulls.cpp \

+    parser/ast/sqlitewindowdefinition.cpp \

     returncode.cpp \

     services/config.cpp \

     common/nulldevice.cpp \

@@ -78,7 +86,6 @@ SOURCES += sqlitestudio.cpp \
     parser/sqlite3_parse.cpp \

     parser/parsercontext.cpp \

     parser/parser.cpp \

-    parser/sqlite2_parse.cpp \

     parser/ast/sqlitestatement.cpp \

     parser/ast/sqlitequery.cpp \

     parser/ast/sqlitealtertable.cpp \

@@ -189,7 +196,6 @@ SOURCES += sqlitestudio.cpp \
     dbobjectorganizer.cpp \

     db/attachguard.cpp \

     db/invaliddb.cpp \

-    dbversionconverter.cpp \

     diff/diff_match_patch.cpp \

     db/sqlquery.cpp \

     db/queryexecutorsteps/queryexecutorvaluesmode.cpp \

@@ -234,7 +240,13 @@ SOURCES += sqlitestudio.cpp \
     parser/ast/sqliteupsert.cpp

 

 HEADERS += sqlitestudio.h\

+    common/compatibility.h \

         coreSQLiteStudio_global.h \

+    db/queryexecutorsteps/queryexecutorcolumntype.h \

+    db/sqlite3.h \

+    parser/ast/sqlitefilterover.h \

+    parser/ast/sqlitenulls.h \

+    parser/ast/sqlitewindowdefinition.h \

     returncode.h \

     services/config.h \

     common/nulldevice.h \

@@ -247,7 +259,6 @@ HEADERS += sqlitestudio.h\
     parser/sqlite3_parse.h \

     parser/parsercontext.h \

     parser/parser.h \

-    parser/sqlite2_parse.h \

     parser/ast/sqlitestatement.h \

     parser/ast/sqlitequery.h \

     parser/ast/sqlitealtertable.h \

@@ -293,7 +304,6 @@ HEADERS += sqlitestudio.h\
     common/objectpool.h \

     selectresolver.h \

     schemaresolver.h \

-    dialect.h \

     db/db.h \

     services/dbmanager.h \

     db/sqlresultsrow.h \

@@ -364,7 +374,6 @@ HEADERS += sqlitestudio.h\
     db/abstractdb3.h \

     db/dbsqlite3.h \

     plugins/dbpluginsqlite3.h \

-    db/abstractdb2.h \

     parser/ast/sqlitewith.h \

     services/collationmanager.h \

     services/impl/collationmanagerimpl.h \

@@ -380,7 +389,6 @@ HEADERS += sqlitestudio.h\
     db/attachguard.h \

     interruptable.h \

     db/invaliddb.h \

-    dbversionconverter.h \

     diff/diff_match_patch.h \

     db/sqlquery.h \

     dbobjecttype.h \

@@ -444,16 +452,13 @@ OTHER_FILES += \
     parser/lempar.c \

     parser/lemon.c \

     parser/sqlite3_parse.y \

-    parser/sqlite2_parse.y \

     parser/run_lemon.sh \

-    TODO.txt \

     licenses/fugue_icons.txt \

     licenses/qhexedit.txt \

     licenses/sqlitestudio_license.txt \

     licenses/lgpl.txt \

     licenses/diff_match.txt \

     licenses/gpl.txt \

-    ChangeLog.txt \

     qt.conf

  \

     Info.plist

@@ -471,18 +476,3 @@ RESOURCES += \
 

 DISTFILES += \

     licenses/mit.txt

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-