Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 56 insertions, 51 deletions

diff --git a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro
index 3293122..d1528aa 100644
--- a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro
+++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro
@@ -1,51 +1,56 @@
-#-------------------------------------------------

-#

-# Project created by QtCreator 2014-09-06T00:39:26

-#

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

-

-QT       += core gui

-

-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

-

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

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

-

-OBJECTS_DIR = $$OBJECTS_DIR/sqlitestudio

-MOC_DIR = $$MOC_DIR/sqlitestudio

-UI_DIR = $$UI_DIR/sqlitestudio

-

-linux: {

-    TARGET = sqlitestudio

-}

-!linux: {

-    TARGET = SQLiteStudio

-}

-TEMPLATE = app

-

-CONFIG   += c++11

-QMAKE_CXXFLAGS += -pedantic

-linux|portable {

-    QMAKE_LFLAGS += -Wl,-rpath,./lib

-}

-

-LIBS += -lcoreSQLiteStudio -lguiSQLiteStudio

-

-SOURCES += main.cpp

-

-win32: {

-    RC_FILE = windows.rc

-}

-

-macx: {

-    ICON = ../guiSQLiteStudio/img/sqlitestudio.icns

-}

-

-OTHER_FILES += \

-    windows.rc \

-    SQLiteStudio.exe.manifest

-

-unix: {

-    target.path = $$BINDIR

-    INSTALLS += target

-}

+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-09-06T00:39:26
+#
+#-------------------------------------------------
+
+QT       += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+include($$PWD/../dirs.pri)
+include($$PWD/../utils.pri)
+
+OBJECTS_DIR = $$OBJECTS_DIR/sqlitestudio
+MOC_DIR = $$MOC_DIR/sqlitestudio
+UI_DIR = $$UI_DIR/sqlitestudio
+
+linux: {
+    TARGET = sqlitestudio
+}
+!linux: {
+    TARGET = SQLiteStudio
+}
+TEMPLATE = app
+
+CONFIG   += c++11
+QMAKE_CXXFLAGS += -pedantic
+linux|portable {
+    QMAKE_LFLAGS += -Wl,-rpath,./lib
+}
+
+LIBS += -lcoreSQLiteStudio -lguiSQLiteStudio
+
+SOURCES += main.cpp
+
+TRANSLATIONS += translations/sqlitestudio_pl.ts
+
+win32: {
+    RC_FILE = windows.rc
+}
+
+macx: {
+    ICON = ../guiSQLiteStudio/img/sqlitestudio.icns
+}
+
+OTHER_FILES += \
+    windows.rc \
+    SQLiteStudio.exe.manifest
+
+unix: {
+    target.path = $$BINDIR
+    INSTALLS += target
+}
+
+RESOURCES += \
+    sqlitestudio.qrc