aboutsummaryrefslogtreecommitdiff
path: root/src/main/main.cpp
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-02-28 16:11:15 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-02-28 16:11:15 -0500
commit7a8685606308c443b55945c3f17f2865892c77c9 (patch)
tree1ed812de6fa52fc8530a68c95f4e98ec0586ff76 /src/main/main.cpp
parent86f35992dcebb03681059db58f414c32b3db4308 (diff)
parent9deca92e0776a97e6364b6e6f36cc8a8718ea2cb (diff)
downloadmonzero-gui-7a8685606308c443b55945c3f17f2865892c77c9.tar.gz
monzero-gui-7a8685606308c443b55945c3f17f2865892c77c9.tar.xz
monzero-gui-7a8685606308c443b55945c3f17f2865892c77c9.zip
Merge pull request #2787
9deca92 fix multiple minor issues (c-style casts, default branch, etc.) (xiphon)
Diffstat (limited to 'src/main/main.cpp')
-rw-r--r--src/main/main.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 9606ad7a..7a454140 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -164,10 +164,10 @@ int main(int argc, char *argv[])
isOpenGL = false;
// disable "QApplication: invalid style override passed" warning
- if (isDesktop) putenv((char*)"QT_STYLE_OVERRIDE=fusion");
+ if (isDesktop) qputenv("QT_STYLE_OVERRIDE", "fusion");
#ifdef Q_OS_LINUX
// force platform xcb
- if (isDesktop) putenv((char*)"QT_QPA_PLATFORM=xcb");
+ if (isDesktop) qputenv("QT_QPA_PLATFORM", "xcb");
#endif
// enable High DPI scaling
@@ -393,8 +393,7 @@ int main(int argc, char *argv[])
// Exclude daemon manager from IOS
#ifndef Q_OS_IOS
- const QStringList arguments = (QStringList) QCoreApplication::arguments().at(0);
- DaemonManager * daemonManager = DaemonManager::instance(&arguments);
+ DaemonManager * daemonManager = DaemonManager::instance();
engine.rootContext()->setContextProperty("daemonManager", daemonManager);
#endif