diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
| commit | 65d5f68cc6dc81799c5a5d90400a2c1f0dd02547 (patch) | |
| tree | 6f245ba901b87ef42fed69965aea22f5eea6b590 /SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro | |
| parent | aeb6bad01630d325a4e768e798a7a6d44e18fdaf (diff) | |
| parent | 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f (diff) | |
Merge tag 'upstream/3.1.0'
Upstream version 3.1.0
# gpg: Signature made Mon 13 Jun 2016 06:42:54 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 | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro index ff07990..be3e876 100644 --- a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro +++ b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro @@ -182,7 +182,12 @@ SOURCES +=\ dialogs/languagedialog.cpp \ common/ipvalidator.cpp \ dialogs/cssdebugdialog.cpp \ - themetuner.cpp + themetuner.cpp \ + dialogs/indexexprcolumndialog.cpp \ + common/centerediconitemdelegate.cpp \ + datagrid/sqlviewmodel.cpp \ + common/exttableview.cpp \ + common/exttablewidget.cpp HEADERS += mainwindow.h \ iconmanager.h \ @@ -329,7 +334,12 @@ HEADERS += mainwindow.h \ dialogs/languagedialog.h \ common/ipvalidator.h \ dialogs/cssdebugdialog.h \ - themetuner.h + themetuner.h \ + dialogs/indexexprcolumndialog.h \ + common/centerediconitemdelegate.h \ + datagrid/sqlviewmodel.h \ + common/exttableview.h \ + common/exttablewidget.h FORMS += mainwindow.ui \ dbtree/dbtree.ui \ @@ -378,7 +388,8 @@ FORMS += mainwindow.ui \ dialogs/newversiondialog.ui \ dialogs/quitconfirmdialog.ui \ dialogs/languagedialog.ui \ - dialogs/cssdebugdialog.ui + dialogs/cssdebugdialog.ui \ + dialogs/indexexprcolumndialog.ui RESOURCES += \ icons.qrc \ |