History

don't force use of Settings to all QCoreApplication

Stephen Birarda committed 11 years ago

Commit ddb52341 parent 83cd50c5 files · +14 −11Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+4−1
@@ -26,6 +26,7 @@ · 25 unmodified lines
26#include <QAbstractNativeEventFilter>26#include <QAbstractNativeEventFilter>
27#include <QActionGroup>27#include <QActionGroup>
28#include <QColorDialog>28#include <QColorDialog>
29#include <QCoreApplication>
29#include <QDesktopWidget>30#include <QDesktopWidget>
30#include <QCheckBox>31#include <QCheckBox>
31#include <QImage>32#include <QImage>
@@ -335,10 +336,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 303 unmodified lines
335 _notifiedPacketVersionMismatchThisDomain(false),336 _notifiedPacketVersionMismatchThisDomain(false),
336 _domainConnectionRefusals(QList<QString>())337 _domainConnectionRefusals(QList<QString>())
337{338{
339
340 Setting::init();
341
338#ifdef Q_OS_WIN342#ifdef Q_OS_WIN
339 installNativeEventFilter(&MyNativeEventFilter::getInstance());343 installNativeEventFilter(&MyNativeEventFilter::getInstance());
340#endif344#endif
341
342 345
343 _logger = new FileLogger(this); // After setting organization name in order to get correct directory346 _logger = new FileLogger(this); // After setting organization name in order to get correct directory
344 347