Merge lp:~apachelogger/ubiquity/fix-qicon-fallback into lp:ubiquity

[Harald Sitter]

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-07 09:52:06 +0000
+++ debian/changelog	2015-01-09 09:27:01 +0000
@@ -1,3 +1,11 @@
+ubiquity (2.21.4) UNRELEASED; urgency=medium
+
+  * kde: explicitly set the KDE_SESSION_VERSION env variable to 4
+    to make sure that for example QIcon uses 4.x compatibility features
+    rather than 3.x ones.
+
+ -- Harald Sitter <[e-mail]>  Fri, 09 Jan 2015 10:14:30 +0100
+
 ubiquity (2.21.3) vivid; urgency=medium
 
   [ Martin Wimpress ]

=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2014-10-13 16:10:59 +0000
+++ ubiquity/frontend/kde_ui.py	2015-01-09 09:27:01 +0000
@@ -160,6 +160,10 @@
         # For above settings to apply automatically we need to indicate that we
         # are inside a full KDE session.
         os.environ["KDE_FULL_SESSION"] = "TRUE"
+        # We also need to indicate version as otherwise KDElibs3 compatibility
+        # might kick in such as in QIconLoader.cpp:QString fallbackTheme.
+        # http://goo.gl/6LkM7X
+        os.environ["KDE_SESSION_VERSION"] = "4"
 
         self.app = QtGui.QApplication([])
         # The "hicolor" icon theme gets picked when Ubiquity is running as a