Development version 1.7.0

src/defines.pri

@@ -7,7 +7,7 @@ UI_DIR = $$PWD/../build
 # workaround for #849: see https://bugreports.qt-project.org/browse/QTBUG-23196
 mocinclude.CONFIG *= fix_target
 
-unix: VERSION = 1.6.0
+unix: VERSION = 1.7.0
 
 # Please read BUILD information #
 #DEFINES *= NO_SYSTEM_DATAPATH

src/lib/app/profileupdater.cpp

@@ -94,6 +94,11 @@ void ProfileUpdater::updateProfile(const QString &current, const QString &profil
         return;
     }
 
+    // 1.7.0 development version
+    if (prof >= Updater::Version("1.6.0") && prof < Updater::Version("1.8.0")) {
+        return;
+    }
+
     std::cout << "QupZilla: Incompatible profile version detected, overwriting profile data..." << std::endl;
 
     copyDataToProfile();

src/lib/app/qupzilla.cpp

@@ -105,7 +105,7 @@
 #define MENU_RECEIVER mApp->macMenuReceiver()
 #endif
 
-const QString QupZilla::VERSION = "1.6.0";
+const QString QupZilla::VERSION = "1.7.0";
 const QString QupZilla::BUILDTIME =  __DATE__" "__TIME__;
 const QString QupZilla::AUTHOR = "David Rosca";
 const QString QupZilla::COPYRIGHT = "2010-2013";

src/main/appicon.rc

@@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico"
 IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,6,0,0
- PRODUCTVERSION 1,6,0,0
+ FILEVERSION 1,7,0,0
+ PRODUCTVERSION 1,7,0,0
  FILEFLAGS 0x0L
  FILEFLAGSMASK 0x3fL
  FILEOS 0x00040004L
@@ -18,12 +18,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "QupZilla Team"
             VALUE "FileDescription", "QupZilla Web Browser"
-            VALUE "FileVersion", "1.6.0"
+            VALUE "FileVersion", "1.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca"
             VALUE "InternalName", "qupzilla"
             VALUE "OriginalFilename", "qupzilla.exe"
             VALUE "ProductName", "QupZilla"
-            VALUE "ProductVersion", "1.6.0"
+            VALUE "ProductVersion", "1.7.0"
         END
     END
     BLOCK "VarFileInfo"

src/plugins/AccessKeysNavigation/akn_plugin.cpp

@@ -64,7 +64,7 @@ bool AKN_Plugin::testPlugin()
 {
     // Let's be sure, require latest version of QupZilla
 
-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
+    return (QupZilla::VERSION == QLatin1String("1.7.0"));
 }
 
 QTranslator* AKN_Plugin::getTranslator(const QString &locale)

src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp

@@ -59,7 +59,7 @@ void GnomeKeyringPlugin::unload()
 
 bool GnomeKeyringPlugin::testPlugin()
 {
-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
+    return (QupZilla::VERSION == QLatin1String("1.7.0"));
 }
 
 QTranslator* GnomeKeyringPlugin::getTranslator(const QString &locale)

src/plugins/GreaseMonkey/gm_plugin.cpp

@@ -81,7 +81,7 @@ void GM_Plugin::unload()
 
 bool GM_Plugin::testPlugin()
 {
-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
+    return (QupZilla::VERSION == QLatin1String("1.7.0"));
 }
 
 QTranslator* GM_Plugin::getTranslator(const QString &locale)

src/plugins/KWalletPasswords/kwalletplugin.cpp

@@ -59,7 +59,7 @@ void KWalletPlugin::unload()
 
 bool KWalletPlugin::testPlugin()
 {
-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
+    return (QupZilla::VERSION == QLatin1String("1.7.0"));
 }
 
 QTranslator* KWalletPlugin::getTranslator(const QString &locale)

src/plugins/MouseGestures/mousegesturesplugin.cpp

@@ -65,7 +65,7 @@ bool MouseGesturesPlugin::testPlugin()
 {
     // Let's be sure, require latest version of QupZilla
 
-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
+    return (QupZilla::VERSION == QLatin1String("1.7.0"));
 }
 
 QTranslator* MouseGesturesPlugin::getTranslator(const QString &locale)

src/plugins/PIM/PIM_plugin.cpp

@@ -67,7 +67,7 @@ bool PIM_Plugin::testPlugin()
 {
     // Let's be sure, require latest version of QupZilla
 
-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
+    return (QupZilla::VERSION == QLatin1String("1.7.0"));
 }
 
 QTranslator* PIM_Plugin::getTranslator(const QString &locale)

src/plugins/StatusBarIcons/statusbariconsplugin.cpp

@@ -72,7 +72,7 @@ void StatusBarIconsPlugin::unload()
 
 bool StatusBarIconsPlugin::testPlugin()
 {
-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
+    return (QupZilla::VERSION == QLatin1String("1.7.0"));
 }
 
 QTranslator* StatusBarIconsPlugin::getTranslator(const QString &locale)

src/plugins/TestPlugin/testplugin.cpp

@@ -97,7 +97,7 @@ bool TestPlugin::testPlugin()
     //There should be some testing if plugin is loaded correctly
     //If this function returns false, plugin is automatically unloaded
 
-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
+    return (QupZilla::VERSION == QLatin1String("1.7.0"));
 }
 
 QTranslator* TestPlugin::getTranslator(const QString &locale)