1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00

Merge pull request #558 from xmt/issue557

Solve Issue 557
This commit is contained in:
David Rosca 2012-09-07 11:46:33 -07:00
commit a5a757a43d
2 changed files with 2 additions and 2 deletions

View File

@ -1868,7 +1868,7 @@ bool QupZilla::restoreState(const QByteArray &state, int version)
return QMainWindow::restoreState(windowState, version); return QMainWindow::restoreState(windowState, version);
#else #else
return QMainWindow::restoreState(windowState, version); return QMainWindow::restoreState(state, version);
#endif #endif
} }

View File

@ -69,7 +69,7 @@ bool PIM_Plugin::testPlugin()
QTranslator* PIM_Plugin::getTranslator(const QString &locale) QTranslator* PIM_Plugin::getTranslator(const QString &locale)
{ {
QTranslator* translator = new QTranslator(); QTranslator* translator = new QTranslator(this);
translator->load(locale, ":/PIM/locale/"); translator->load(locale, ":/PIM/locale/");
return translator; return translator;
} }