Merge tag 'upstream/3.0.1'

Upstream version 3.0.1

# gpg: Signature made Tue 30 Dec 2014 12:06:57 AM 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>"

5 files changed, 14 insertions, 2 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/ChangeLog.txt b/SQLiteStudio3/coreSQLiteStudio/ChangeLog.txt
index 7042dcc..0baf02c 100644
--- a/SQLiteStudio3/coreSQLiteStudio/ChangeLog.txt
+++ b/SQLiteStudio3/coreSQLiteStudio/ChangeLog.txt
@@ -1,3 +1,9 @@
+[3.0.1]
+        * [ADDED]: When the data is being read into the Gird View, columns width gets automatically adjusted, so for small values they are shrinked and for bigger values they're enlarged, but never above the configured limit (a new option in config dialog).
+        * [ADDED]: Implemented support for immediate editing of rows just added to the WITHOUT ROWID tables (previously the manual refresh of data view was required).
+        * [BUGFIX]: Fixed support for expressions as DEFAULT value in table.
+        * [BUGFIX]: Fixed support under Windows for running portable distribution, while having different version of Qt installed in the system (added the qt.conf file).
+
 [3.0.0]
         * [ADDED]: Application has been rewritten from scratch in C++ and Qt (was previously written in Tcl/Tk). This means improvements in all areas, especially in application performance, good looking interface, more friendly interface and more stability.
         * [ADDED]: Database list can now group databases in named groups (groups can be embedded in each other).
diff --git a/SQLiteStudio3/coreSQLiteStudio/TODO.txt b/SQLiteStudio3/coreSQLiteStudio/TODO.txt
index a86a49b..458d550 100644
--- a/SQLiteStudio3/coreSQLiteStudio/TODO.txt
+++ b/SQLiteStudio3/coreSQLiteStudio/TODO.txt
@@ -1,3 +1,5 @@
+* 3.0.1:
+
 * Next versions:
 - commiting DataView should be async
 - syntax checkers as services - per language
diff --git a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro
index c5c81eb..1ce7520 100644
--- a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro
+++ b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro
@@ -19,6 +19,7 @@ TEMPLATE = lib
 
 win32 {
     LIBS += -lpsapi $$PWD/../../../lib/libquazip.a
+    DISTFILES += qt.conf
 }
 
 linux: {
@@ -404,7 +405,8 @@ OTHER_FILES += \
     licenses/lgpl.txt \
     licenses/diff_match.txt \
     licenses/gpl.txt \
-    ChangeLog.txt
+    ChangeLog.txt \
+    qt.conf
 
 FORMS += \
     plugins/populatesequence.ui \
diff --git a/SQLiteStudio3/coreSQLiteStudio/qt.conf b/SQLiteStudio3/coreSQLiteStudio/qt.conf
new file mode 100644
index 0000000..4196808
--- /dev/null
+++ b/SQLiteStudio3/coreSQLiteStudio/qt.conf
@@ -0,0 +1,2 @@
+[Paths]
+Prefix = .
diff --git a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp
index c253583..3595b21 100644
--- a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp
@@ -38,7 +38,7 @@
 
 DEFINE_SINGLETON(SQLiteStudio)
 
-static const int sqlitestudioVersion = 30000;
+static const int sqlitestudioVersion = 30001;
 
 SQLiteStudio::SQLiteStudio()
 {