summaryrefslogtreecommitdiffstats
path: root/src/designer/src/lib/shared/qtresourceeditordialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/designer/src/lib/shared/qtresourceeditordialog.cpp')
-rw-r--r--src/designer/src/lib/shared/qtresourceeditordialog.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
index 6d44f3f33..a6d9a9866 100644
--- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp
+++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
@@ -2063,8 +2063,9 @@ QtResourceEditorDialog::QtResourceEditorDialog(QDesignerFormEditorInterface *cor
settings->beginGroup(QLatin1String(QrcDialogC));
d_ptr->m_ui.splitter->restoreState(settings->value(QLatin1String(SplitterPosition)).toByteArray());
- if (settings->contains(QLatin1String(Geometry)))
- setGeometry(settings->value(QLatin1String(Geometry)).toRect());
+ const QVariant geometry = settings->value(QLatin1String(Geometry));
+ if (geometry.type() == QVariant::ByteArray) // Used to be a QRect up until 5.4.0, QTBUG-43374
+ restoreGeometry(geometry.toByteArray());
settings->endGroup();
}
@@ -2075,7 +2076,7 @@ QtResourceEditorDialog::~QtResourceEditorDialog()
settings->beginGroup(QLatin1String(QrcDialogC));
settings->setValue(QLatin1String(SplitterPosition), d_ptr->m_ui.splitter->saveState());
- settings->setValue(QLatin1String(Geometry), geometry());
+ settings->setValue(QLatin1String(Geometry), saveGeometry());
settings->endGroup();
}