summaryrefslogtreecommitdiffstats
path: root/core/qt-init.cpp
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@gmail.com>2016-08-26 16:52:51 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-08-27 11:40:45 -0700
commit9b2404fcb4b360a12a8f997a4b9111e5f44bf444 (patch)
tree3c8cb2f24394c3dca2a3a563682466a9b3612c7e /core/qt-init.cpp
parent8f178301d8b93f50c38cd00b7cc47a259e1fed43 (diff)
downloadsubsurface-9b2404fcb4b360a12a8f997a4b9111e5f44bf444.tar.gz
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>
Diffstat (limited to 'core/qt-init.cpp')
-rw-r--r--core/qt-init.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/qt-init.cpp b/core/qt-init.cpp
index 6e018faec..fbb755c47 100644
--- a/core/qt-init.cpp
+++ b/core/qt-init.cpp
@@ -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);