New upstream version 3.2.1+dfsg1upstream/3.2.1+dfsg1

1 files changed, 30 insertions, 13 deletions

diff --git a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro
index 42aa7dc..96d9f0d 100644
--- a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro
+++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro
@@ -4,9 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets network
 
 include($$PWD/../dirs.pri)
 include($$PWD/../utils.pri)
@@ -15,25 +13,37 @@ OBJECTS_DIR = $$OBJECTS_DIR/sqlitestudio
 MOC_DIR = $$MOC_DIR/sqlitestudio
 UI_DIR = $$UI_DIR/sqlitestudio
 
-linux: {
+linux {
     TARGET = sqlitestudio
-}
-!linux: {
+} else {
     TARGET = SQLiteStudio
 }
 TEMPLATE = app
 
 CONFIG   += c++11
 QMAKE_CXXFLAGS += -pedantic
-linux|portable {
-    QMAKE_LFLAGS += -Wl,-rpath,./lib
+
+DEFINES += QAPPLICATION_CLASS=QApplication
+
+win32 {
+    msvc:LIBS += Advapi32.lib
+    gcc:LIBS += -lAdvapi32
+}
+
+portable {
+    DEFINES += PORTABLE_CONFIG
+    linux {
+        QMAKE_LFLAGS += -Wl,-rpath,./lib
+    }
 }
 
 LIBS += -lcoreSQLiteStudio -lguiSQLiteStudio
 
-SOURCES += main.cpp
+SOURCES += main.cpp \
+    singleapplication/singleapplication.cpp
 
-TRANSLATIONS += translations/sqlitestudio_de.ts \
+TRANSLATIONS += translations/sqlitestudio_ro_RO.ts \
+		translations/sqlitestudio_de.ts \
 		translations/sqlitestudio_it.ts \
 		translations/sqlitestudio_zh_CN.ts \
 		translations/sqlitestudio_sk.ts \
@@ -43,11 +53,13 @@ TRANSLATIONS += translations/sqlitestudio_de.ts \
 		translations/sqlitestudio_es.ts \
 		translations/sqlitestudio_pl.ts
 
-win32: {
+win32 {
     RC_FILE = windows.rc
+    msvc:LIBS += User32.lib
+    gcc:LIBS += -lUser32
 }
 
-macx: {
+macx {
     ICON = ../guiSQLiteStudio/img/sqlitestudio.icns
 }
 
@@ -55,7 +67,7 @@ OTHER_FILES += \
     windows.rc \
     SQLiteStudio.exe.manifest
 
-unix: {
+unix {
     target.path = $$BINDIR
     INSTALLS += target
 }
@@ -63,6 +75,11 @@ unix: {
 RESOURCES += \
     sqlitestudio.qrc
 
+HEADERS += \
+    singleapplication/singleapplication.h \
+    singleapplication/singleapplication_p.h
+
+