Merge tag 'v5.15.5-lts' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl

Qt For Python Release 5.15.5

Change-Id: Id8648afb982e4f1354257a0b523bc9c6f1acce2a

2 files changed, 14 insertions, 18 deletions

diff --git a/examples/widgets/mainwindows/application/application.py b/examples/widgets/mainwindows/application/application.py
index 8c4626f9b..5645a0746 100644
--- a/examples/widgets/mainwindows/application/application.py
+++ b/examples/widgets/mainwindows/application/application.py
@@ -189,16 +189,14 @@ class MainWindow(QtWidgets.QMainWindow):
         self.statusBar().showMessage("Ready")
 
     def readSettings(self):
-        settings = QtCore.QSettings("Trolltech", "Application Example")
-        pos = settings.value("pos", QtCore.QPoint(200, 200))
-        size = settings.value("size", QtCore.QSize(400, 400))
-        self.resize(size)
-        self.move(pos)
+        settings = QtCore.QSettings('QtProject', 'Application Example')
+        geometry = settings.value('geometry', QtCore.QByteArray())
+        if geometry.size():
+            self.restoreGeometry(geometry)
 
     def writeSettings(self):
-        settings = QtCore.QSettings("Trolltech", "Application Example")
-        settings.setValue("pos", self.pos())
-        settings.setValue("size", self.size())
+        settings = QtCore.QSettings('QtProject', 'Application Example')
+        settings.setValue('geometry', self.saveGeometry())
 
     def maybeSave(self):
         if self.textEdit.document().isModified():
diff --git a/examples/widgets/mainwindows/mdi/mdi.py b/examples/widgets/mainwindows/mdi/mdi.py
index 9daca826d..9eca5fdba 100644
--- a/examples/widgets/mainwindows/mdi/mdi.py
+++ b/examples/widgets/mainwindows/mdi/mdi.py
@@ -42,8 +42,8 @@
 
 """PySide2 port of the widgets/draganddrop/draggabletext example from Qt v5.x, originating from PyQt"""
 
-from PySide2.QtCore import (QFile, QFileInfo, QPoint, QSettings, QSignalMapper,
-        QSaveFile, QSize, QTextStream, Qt)
+from PySide2.QtCore import (QByteArray, QFile, QFileInfo, QPoint, QSettings,
+        QSignalMapper, QSaveFile, QSize, QTextStream, Qt)
 from PySide2.QtGui import QIcon, QKeySequence
 from PySide2.QtWidgets import (QAction, QApplication, QFileDialog, QMainWindow,
         QMdiArea, QMessageBox, QTextEdit, QWidget)
@@ -405,16 +405,14 @@ class MainWindow(QMainWindow):
         self.statusBar().showMessage("Ready")
 
     def readSettings(self):
-        settings = QSettings('Trolltech', 'MDI Example')
-        pos = settings.value('pos', QPoint(200, 200))
-        size = settings.value('size', QSize(400, 400))
-        self.move(pos)
-        self.resize(size)
+        settings = QSettings('QtProject', 'MDI Example')
+        geometry = settings.value('geometry', QByteArray())
+        if geometry.size():
+            self.restoreGeometry(geometry)
 
     def writeSettings(self):
-        settings = QSettings('Trolltech', 'MDI Example')
-        settings.setValue('pos', self.pos())
-        settings.setValue('size', self.size())
+        settings = QSettings('QtProject', 'MDI Example')
+        settings.setValue('geometry', self.saveGeometry())
 
     def activeMdiChild(self):
         activeSubWindow = self.mdiArea.activeSubWindow()