From 36dd2e086d6117a49a67349308c7d4f478bb945c Mon Sep 17 00:00:00 2001 From: Mark Tolley Date: Fri, 7 Sep 2012 19:31:55 +0100 Subject: [PATCH 1/2] Fix build on windows --- src/lib/app/qupzilla.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp index 4e1b5d111..c99fc2c28 100644 --- a/src/lib/app/qupzilla.cpp +++ b/src/lib/app/qupzilla.cpp @@ -1868,7 +1868,7 @@ bool QupZilla::restoreState(const QByteArray &state, int version) return QMainWindow::restoreState(windowState, version); #else - return QMainWindow::restoreState(windowState, version); + return QMainWindow::restoreState(state, version); #endif } From 41168f0ff49b0ed3f1d2d0341b030f23202489f1 Mon Sep 17 00:00:00 2001 From: Mark Tolley Date: Fri, 7 Sep 2012 19:33:38 +0100 Subject: [PATCH 2/2] Fix crash on unloading PIM plugin --- src/plugins/PIM/PIM_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/PIM/PIM_plugin.cpp b/src/plugins/PIM/PIM_plugin.cpp index dff1fd088..7198cfdc5 100644 --- a/src/plugins/PIM/PIM_plugin.cpp +++ b/src/plugins/PIM/PIM_plugin.cpp @@ -69,7 +69,7 @@ bool PIM_Plugin::testPlugin() QTranslator* PIM_Plugin::getTranslator(const QString &locale) { - QTranslator* translator = new QTranslator(); + QTranslator* translator = new QTranslator(this); translator->load(locale, ":/PIM/locale/"); return translator; }