New upstream version 3.4.4+dfsg.upstream/3.4.4+dfsg

1 files changed, 26 insertions, 23 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro
index bcd8148..ee78caa 100644
--- a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro
+++ b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro
@@ -4,7 +4,7 @@
 #

 #-------------------------------------------------

 

-include($$PWD/../dirs.pri)

+include($$PWD/../common.pri)

 include($$PWD/../utils.pri)

 

 OBJECTS_DIR = $$OBJECTS_DIR/coreSQLiteStudio

@@ -12,13 +12,13 @@ MOC_DIR = $$MOC_DIR/coreSQLiteStudio
 UI_DIR = $$UI_DIR/coreSQLiteStudio

 

 QT       -= gui

-QT       += script network

+QT       += qml network

 

 TARGET = coreSQLiteStudio

 TEMPLATE = lib

 

 win32: {

-    LIBS += -lpsapi -limagehlp

+    LIBS += -lpsapi -limagehlp -lversion

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

 

     !debug: {

@@ -26,7 +26,7 @@ win32: {
         THE_DEST = $${DESTDIR}

         THE_FILE ~= s,/,\\,g

         THE_DEST ~= s,/,\\,g

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

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

     }

 }

 

@@ -39,10 +39,10 @@ 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/Contents

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

+    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/Contents\""

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

     LIBS += -L/usr/local/lib

 }

 

@@ -57,24 +57,20 @@ portable {
 CONFIG  += c++17

 QMAKE_CXXFLAGS += -pedantic

 

-TRANSLATIONS += translations/coreSQLiteStudio_ro_RO.ts \

-		translations/coreSQLiteStudio_de.ts \

-		translations/coreSQLiteStudio_it.ts \

-		translations/coreSQLiteStudio_zh_CN.ts \

-		translations/coreSQLiteStudio_sk.ts \

-		translations/coreSQLiteStudio_ru.ts \

-		translations/coreSQLiteStudio_pt_BR.ts \

-		translations/coreSQLiteStudio_fr.ts \

-		translations/coreSQLiteStudio_es.ts \

-		translations/coreSQLiteStudio_pl.ts

-

 SOURCES += sqlitestudio.cpp \

+    chillout/chillout.cpp \

+    chillout/common/common.cpp \

+    chillout/posix/posixcrashhandler.cpp \

+    chillout/windows/StackWalker.cpp \

+    chillout/windows/windowscrashhandler.cpp \

     common/compatibility.cpp \

     db/queryexecutorsteps/queryexecutorcolumntype.cpp \

+    db/queryexecutorsteps/queryexecutorfilter.cpp \

     parser/ast/sqlitefilterover.cpp \

     parser/ast/sqlitenulls.cpp \

     parser/ast/sqlitewindowdefinition.cpp \

     returncode.cpp \

+    services/codesnippetmanager.cpp \

     services/config.cpp \

     common/nulldevice.cpp \

     parser/lexer_low_lev.cpp \

@@ -112,7 +108,6 @@ SOURCES += sqlitestudio.cpp \
     parser/ast/sqliteselect.cpp \

     parser/ast/sqliteupdate.cpp \

     parser/ast/sqlitevacuum.cpp \

-    parser/ast/sqlitecopy.cpp \

     parser/ast/sqliteemptyquery.cpp \

     parser/parser_helper_stubs.cpp \

     parser/ast/sqliteexpr.cpp \

@@ -147,7 +142,6 @@ SOURCES += sqlitestudio.cpp \
     db/queryexecutorsteps/queryexecutoraddrowids.cpp \

     db/queryexecutorsteps/queryexecutorlimit.cpp \

     db/queryexecutorsteps/queryexecutorcolumns.cpp \

-    db/queryexecutorsteps/queryexecutorcellsize.cpp \

     db/queryexecutorsteps/queryexecutororder.cpp \

     db/sqlerrorcodes.cpp \

     common/readwritelocker.cpp \

@@ -156,6 +150,7 @@ SOURCES += sqlitestudio.cpp \
     csvserializer.cpp \

     db/queryexecutorsteps/queryexecutordatasources.cpp \

     expectedtoken.cpp \

+    sqlfileexecutor.cpp \

     sqlhistorymodel.cpp \

     db/queryexecutorsteps/queryexecutorexplainmode.cpp \

     services/notifymanager.cpp \

@@ -240,14 +235,22 @@ SOURCES += sqlitestudio.cpp \
     parser/ast/sqliteupsert.cpp

 

 HEADERS += sqlitestudio.h\

+    chillout/chillout.h \

+    chillout/common/common.h \

+    chillout/defines.h \

+    chillout/posix/posixcrashhandler.h \

+    chillout/windows/StackWalker.h \

+    chillout/windows/windowscrashhandler.h \

     common/compatibility.h \

         coreSQLiteStudio_global.h \

     db/queryexecutorsteps/queryexecutorcolumntype.h \

+    db/queryexecutorsteps/queryexecutorfilter.h \

     db/sqlite3.h \

     parser/ast/sqlitefilterover.h \

     parser/ast/sqlitenulls.h \

     parser/ast/sqlitewindowdefinition.h \

     returncode.h \

+    services/codesnippetmanager.h \

     services/config.h \

     common/nulldevice.h \

     parser/lexer_low_lev.h \

@@ -285,7 +288,6 @@ HEADERS += sqlitestudio.h\
     parser/ast/sqliteselect.h \

     parser/ast/sqliteupdate.h \

     parser/ast/sqlitevacuum.h \

-    parser/ast/sqlitecopy.h \

     parser/ast/sqlitequerytype.h \

     parser/ast/sqliteemptyquery.h \

     parser/parser_helper_stubs.h \

@@ -329,7 +331,6 @@ HEADERS += sqlitestudio.h\
     db/queryexecutorsteps/queryexecutoraddrowids.h \

     db/queryexecutorsteps/queryexecutorlimit.h \

     db/queryexecutorsteps/queryexecutorcolumns.h \

-    db/queryexecutorsteps/queryexecutorcellsize.h \

     common/unused.h \

     db/queryexecutorsteps/queryexecutororder.h \

     common/readwritelocker.h \

@@ -337,6 +338,7 @@ HEADERS += sqlitestudio.h\
     csvformat.h \

     csvserializer.h \

     db/queryexecutorsteps/queryexecutordatasources.h \

+    sqlfileexecutor.h \

     sqlhistorymodel.h \

     db/queryexecutorsteps/queryexecutorexplainmode.h \

     services/notifymanager.h \

@@ -475,4 +477,5 @@ RESOURCES += \
     coreSQLiteStudio.qrc

 

 DISTFILES += \

+    licenses/icu.txt \

     licenses/mit.txt