Merge remote-tracking branch 'chiiph/bug/force_cleanlooks' into develop

2 files changed, 12 insertions, 0 deletions

diff --git a/changes/bug_force_cleanlooks b/changes/bug_force_cleanlooks
new file mode 100644
index 00000000..cc0343c0
--- /dev/null
+++ b/changes/bug_force_cleanlooks
@@ -0,0 +1,3 @@
+  o Force Cleanlooks style if we are running in a KDE environment, so
+    that it doesn't load potentially incompatible Qt libs. Fixes
+    #3194.
\ No newline at end of file
diff --git a/src/leap/app.py b/src/leap/app.py
index c0902efa..7ec755f9 100644
--- a/src/leap/app.py
+++ b/src/leap/app.py
@@ -18,6 +18,7 @@
 import logging
 import signal
 import sys
+import os
 
 from functools import partial
 
@@ -155,6 +156,14 @@ def main():
     logger.info('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
 
     logger.info('Starting app')
+
+    # We force the style if on KDE so that it doesn't load all the kde
+    # libs, which causes a compatibility issue in some systems.
+    # For more info, see issue #3194
+    if os.environ.get("KDE_SESSION_UID") is not None:
+        sys.argv.append("-style")
+        sys.argv.append("Cleanlooks")
+
     app = QtGui.QApplication(sys.argv)
 
     # install the qt4reactor.