Merge pull request #147 from PauloCarvalhoRJ/VersionPrep

Closing version 3.6
PauloCarvalhoRJ · Jan 6, 2018 · 4a8d2fb · 4a8d2fb
2 parents 64d78d1 + 08f3263
commit 4a8d2fb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/GammaRay.pro b/GammaRay.pro
@@ -479,7 +479,7 @@ win32 {
 # The application version
 # Don't forget to update the Util::importSettingsFromPreviousVersion() method to
 # enable the import of registry/user settings of previous versions.
-VERSION = 3.5
+VERSION = 3.6
 
 # Define a preprocessor macro so we can get the application version in application code.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"

diff --git a/docs/GammaRayManual.docx b/docs/GammaRayManual.docx
diff --git a/util.cpp b/util.cpp
@@ -968,7 +968,7 @@ void Util::importSettingsFromPreviousVersion()
     QSettings currentSettings;
     //The list of previous versions (order from latest to oldest version is advised)
     QStringList previousVersions;
-    previousVersions << "3.2" << "3.0" << "2.7.2" << "2.7.1" << "2.7" << "2.5.1" << "2.5" << "2.4" << "2.3" << "2.2"
+    previousVersions << "3.5" << "3.2" << "3.0" << "2.7.2" << "2.7.1" << "2.7" << "2.5.1" << "2.5" << "2.4" << "2.3" << "2.2"
                      << "2.1" << "2.0" << "1.7.1" << "1.7" << "1.6" << "1.5" << "1.4" << "1.3.1" << "1.3" << "1.2.1"
                      << "1.2" << "1.1.0" << "1.0.1" << "1.0";
     //Iterate through the list of previous versions