Merge pull request #558 from xmt/issue557

Solve Issue 557
remotes/origin/falkon
David Rosca 14 years ago
commit a5a757a43d
  1. 2
      src/lib/app/qupzilla.cpp
  2. 2
      src/plugins/PIM/PIM_plugin.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
}

@ -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;
}

Loading…
Cancel
Save