From 539bc84f39ffaff04c99b7d10aac60275588dc79 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 24 Jan 2019 12:17:34 +0100 Subject: store qt version in geometry keys to avoid strange behaviours w multiple Qts on one system --- src/gui/mainwindow.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/gui/mainwindow.cpp') diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index c450b5b..71fea63 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -46,8 +46,8 @@ MainWindow::MainWindow(QWidget *parent) : _menu->setParent(this); setMenuBar(_menu); - QVariant geom = settings.value("geometry-main"); - QVariant state = settings.value("windowState-main"); + QVariant geom = settings.value(QString("geometry-main-qt") + qVersion()); + QVariant state = settings.value(QString("windowState-main-qt") + qVersion()); if (geom.isValid()) { restoreGeometry(geom.toByteArray()); @@ -108,11 +108,10 @@ QSplitter *MainWindow::splitter() const { void MainWindow::closeEvent(QCloseEvent *event) { - //qDebug() << "got close event"; - + // store qt version in window geometry keys to avoid strange behaviour w/ multiple Qt's on one system QSettings settings("tikzit", "tikzit"); - settings.setValue("geometry-main", saveGeometry()); - settings.setValue("windowState-main", saveState(2)); + settings.setValue(QString("geometry-main-qt") + qVersion(), saveGeometry()); + settings.setValue(QString("windowState-main-qt") + qVersion(), saveState(2)); if (!_tikzDocument->isClean()) { QString nm = _tikzDocument->shortName(); -- cgit v1.2.3