Merge branch 'master' into focused_dockwidget

2020-06-05 07:40:39 +02:00
parent a65b1bdcaf f074ea9d67
commit d360b4ced2
9 changed files with 73 additions and 12 deletions
--- a/src/DockManager.cpp
+++ b/src/DockManager.cpp
@@ -265,6 +265,7 @@ bool DockManagerPrivate::restoreStateFromXml(const QByteArray &state,  int versi
    {
    	return false;
    }
+    s.setFileVersion(v);

    ADS_PRINT(s.attributes().value("UserVersion"));
    // Older files do not support UserVersion but we still want to load them so
@@ -278,7 +279,6 @@ bool DockManagerPrivate::restoreStateFromXml(const QByteArray &state,  int versi
 		}
    }

-    s.setFileVersion(v);
    bool Result = true;
 #ifdef ADS_DEBUG_PRINT
    int  DockContainers = s.attributes().value("Containers").toInt();