Qt4: Fixed broken session restoring.

Adding Qt version into sessionVersion number
only when using Qt 5.

Closes #689

src/lib/app/mainapplication.cpp

@@ -269,6 +269,9 @@ MainApplication::MainApplication(int &argc, char** argv)
         }
         if (m_startingAfterCrash || afterLaunch == 3) {
             m_restoreManager = new RestoreManager(m_activeProfil + "session.dat");
+            if (!m_restoreManager->isValid()) {
+                destroyRestoreManager();
+            }
         }
     }
 

src/lib/app/qz_namespace.h

@@ -30,9 +30,9 @@ namespace Qz
 {
 // Version of session.dat file
 #if QT_VERSION >= 0x050000
-static const int sessionVersion = 0x0003 & 0x050000;
+static const int sessionVersion = 0x0003 | 0x050000;
 #else
-static const int sessionVersion = 0x0003 & 0x040000;
+static const int sessionVersion = 0x0003;
 #endif
 
 enum AppMessageType {

src/lib/session/restoremanager.cpp

@@ -30,6 +30,11 @@ RestoreData RestoreManager::restoreData() const
     return m_data;
 }
 
+bool RestoreManager::isValid() const
+{
+    return !m_data.isEmpty();
+}
+
 void RestoreManager::createFromFile(const QString &file)
 {
     if (!QFile::exists(file)) {
@@ -42,6 +47,7 @@ void RestoreManager::createFromFile(const QString &file)
 
     int version;
     stream >> version;
+
     if (version != Qz::sessionVersion) {
         return;
     }

src/lib/session/restoremanager.h

@@ -34,6 +34,7 @@ public:
     RestoreManager(const QString &sessionFile);
 
     QList<RestoreManager::WindowData> restoreData() const;
+    bool isValid() const;
 
 private:
     void createFromFile(const QString &file);