1 files changed, 13 insertions, 48 deletions

diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.cpp
index 4da6b71b40..48588c7973 100644
--- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.cpp
+++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QML preview debug service.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qqmlpreviewposition.h"
 
@@ -92,14 +56,13 @@ QQmlPreviewPosition::QQmlPreviewPosition()
 {
     m_savePositionTimer.setSingleShot(true);
     m_savePositionTimer.setInterval(500);
-    QObject::connect(&m_savePositionTimer, &QTimer::timeout, [this]() {
+    QObject::connect(&m_savePositionTimer, &QTimer::timeout, &m_savePositionTimer, [this]() {
         saveWindowPosition();
     });
 }
 
 QQmlPreviewPosition::~QQmlPreviewPosition()
 {
-    saveWindowPosition();
 }
 
 void QQmlPreviewPosition::takePosition(QWindow *window, InitializeState state)
@@ -111,7 +74,7 @@ void QQmlPreviewPosition::takePosition(QWindow *window, InitializeState state)
         auto screen = window->screen();
         auto nativePosition = QHighDpiScaling::mapPositionToNative(window->framePosition(),
                                                                    screen->handle());
-        m_lastWindowPosition = {screen->name(), nativePosition};
+        m_lastWindowPosition = { screen->name(), nativePosition, window->size() };
 
         m_savePositionTimer.start();
     }
@@ -166,11 +129,8 @@ QByteArray QQmlPreviewPosition::fromPositionToByteArray(
     const quint16 majorVersion = 1;
     const quint16 minorVersion = 0;
 
-    stream << majorVersion
-           << minorVersion
-           << m_currentInitScreensData
-           << position.screenName
-           << position.nativePosition;
+    stream << majorVersion << minorVersion << m_currentInitScreensData << position.screenName
+           << position.nativePosition << position.size;
     return array;
 }
 
@@ -203,7 +163,11 @@ void QQmlPreviewPosition::readLastPositionFromByteArray(const QByteArray &array)
     stream >> nativePosition;
     if (nativePosition.isNull())
         return;
-    m_lastWindowPosition = {nameOfScreen, nativePosition};
+
+    QSize size;
+    stream >> size;
+
+    m_lastWindowPosition = { nameOfScreen, nativePosition, size };
 }
 
 void QQmlPreviewPosition::setPosition(const QQmlPreviewPosition::Position &position,
@@ -215,7 +179,8 @@ void QQmlPreviewPosition::setPosition(const QQmlPreviewPosition::Position &posit
         window->setScreen(screen);
         const auto point = QHighDpiScaling::mapPositionFromNative(position.nativePosition,
                                                                   screen->handle());
-        const QRect geometry(point, window->size());
+
+        const QRect geometry(point, position.size);
         if (screen->virtualGeometry().contains(geometry))
             window->setFramePosition(point);
         else