aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Blair <snipa@jagtech.io>2020-10-28 00:43:43 -0700
committerAlexander Blair <snipa@jagtech.io>2020-10-28 00:43:43 -0700
commit7f164e739a261980823931a1823ef4d54d4e0238 (patch)
treef144ff432535fd61996b3a1df446521288554306
parent43214de7d03f86fe72cfea8d0bb261475a2da805 (diff)
parent9b18344d23319cbd80645e6ac97d6170a444e018 (diff)
downloadmonzero-gui-7f164e739a261980823931a1823ef4d54d4e0238.tar.gz
monzero-gui-7f164e739a261980823931a1823ef4d54d4e0238.tar.xz
monzero-gui-7f164e739a261980823931a1823ef4d54d4e0238.zip
Merge pull request #3194
9b18344d main: don't override user-provided QT_QPA_PLATFORM env variable (xiphon)
-rw-r--r--src/main/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 0875c530..975b42cf 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -177,8 +177,8 @@ int main(int argc, char *argv[])
// disable "QApplication: invalid style override passed" warning
if (isDesktop) qputenv("QT_STYLE_OVERRIDE", "fusion");
#ifdef Q_OS_LINUX
- // force platform xcb
- if (isDesktop) qputenv("QT_QPA_PLATFORM", "xcb");
+ // platform xcb by default
+ if (isDesktop && qEnvironmentVariableIsEmpty("QT_QPA_PLATFORM")) qputenv("QT_QPA_PLATFORM", "xcb");
#endif
// enable High DPI scaling