diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-01-30 17:00:24 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-01-30 17:00:24 -0500 |
| commit | e4767514ed04e6a0bddf3f4a47f5f0b09e65e0ee (patch) | |
| tree | 86cadc2137831d44fa29fd40a2964f7fb1326de4 /SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro | |
| parent | 26ddfe11c2b7fac52e5f57dcd9f5223a50b2a9a7 (diff) | |
| parent | 016003905ca0e8e459e3dc33e786beda8ec92f45 (diff) | |
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>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro index 2195415..93796ea 100644 --- a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro +++ b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro @@ -27,6 +27,8 @@ QMAKE_CXXFLAGS += -pedantic DEFINES += GUISQLITESTUDIO_LIBRARY +TRANSLATIONS += translations/guiSQLiteStudio_pl.ts + SOURCES +=\ mainwindow.cpp \ iconmanager.cpp \ @@ -164,7 +166,8 @@ SOURCES +=\ windows/bugreporthistorywindow.cpp \ dialogs/newversiondialog.cpp \ dialogs/quitconfirmdialog.cpp \ - common/datawidgetmapper.cpp + common/datawidgetmapper.cpp \ + dialogs/languagedialog.cpp HEADERS += mainwindow.h \ iconmanager.h \ @@ -307,7 +310,8 @@ HEADERS += mainwindow.h \ dialogs/newversiondialog.h \ guiSQLiteStudio_global.h \ dialogs/quitconfirmdialog.h \ - common/datawidgetmapper.h + common/datawidgetmapper.h \ + dialogs/languagedialog.h FORMS += mainwindow.ui \ dbtree/dbtree.ui \ @@ -354,10 +358,12 @@ FORMS += mainwindow.ui \ dialogs/bugreportlogindialog.ui \ windows/bugreporthistorywindow.ui \ dialogs/newversiondialog.ui \ - dialogs/quitconfirmdialog.ui + dialogs/quitconfirmdialog.ui \ + dialogs/languagedialog.ui RESOURCES += \ - icons.qrc + icons.qrc \ + guiSQLiteStudio.qrc OTHER_FILES += |