Settings update: Move loadPreferences out of qt-helper.cpp

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-08-26 16:52:51 -03:00 committed by Dirk Hohndel
parent 8f178301d8
commit 9b2404fcb4
5 changed files with 165 additions and 169 deletions

View file

@ -3,6 +3,7 @@
#include <QLibraryInfo>
#include <QTextCodec>
#include "helpers.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"
char *settings_suffix = NULL;
QTranslator *qtTranslator, *ssrfTranslator;
@ -31,6 +32,8 @@ void init_qt_late()
QCoreApplication::setApplicationName("Subsurface");
}
// find plugins installed in the application directory (without this SVGs don't work on Windows)
SettingsObjectWrapper::instance()->load();
QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
QLocale loc;
QString uiLang = uiLanguage(&loc);