diff options
| author | 2015-05-12 16:19:47 -0400 | |
|---|---|---|
| committer | 2015-05-12 16:19:47 -0400 | |
| commit | 6ce5ee411d1e6093b68b1b4eca5dc6c12b927a96 (patch) | |
| tree | 1a98416041b39765c1c42ffbeab6da9fd40e181b /SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro | |
| parent | 1fc9d1a4a1af320e39810cee21bed1201e2bddfd (diff) | |
| parent | 9618f0ebbf4b88045247c01ce8c8f58203508ebf (diff) | |
Merge tag 'upstream/3.0.6'
Upstream version 3.0.6
# gpg: Signature made Tue 12 May 2015 04:19:45 PM EDT 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>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro index e32aff5..3010dca 100644 --- a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro +++ b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro @@ -19,6 +19,10 @@ linux: { } } +portable: { + DEFINES += PORTABLE_CONFIG +} + TARGET = guiSQLiteStudio TEMPLATE = lib @@ -175,7 +179,9 @@ SOURCES +=\ dialogs/quitconfirmdialog.cpp \ common/datawidgetmapper.cpp \ dialogs/languagedialog.cpp \ - common/ipvalidator.cpp + common/ipvalidator.cpp \ + dialogs/cssdebugdialog.cpp \ + themetuner.cpp HEADERS += mainwindow.h \ iconmanager.h \ @@ -320,7 +326,9 @@ HEADERS += mainwindow.h \ dialogs/quitconfirmdialog.h \ common/datawidgetmapper.h \ dialogs/languagedialog.h \ - common/ipvalidator.h + common/ipvalidator.h \ + dialogs/cssdebugdialog.h \ + themetuner.h FORMS += mainwindow.ui \ dbtree/dbtree.ui \ @@ -368,7 +376,8 @@ FORMS += mainwindow.ui \ windows/bugreporthistorywindow.ui \ dialogs/newversiondialog.ui \ dialogs/quitconfirmdialog.ui \ - dialogs/languagedialog.ui + dialogs/languagedialog.ui \ + dialogs/cssdebugdialog.ui RESOURCES += \ icons.qrc \ @@ -383,6 +392,9 @@ unix: { LIBS += -lcoreSQLiteStudio +DISTFILES += \ + general.css + |
