From 04c6b3917e0742582d9506028ed42ebe31132ca0 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sun, 14 Aug 2016 14:50:27 +0200
Subject: [PATCH] [util-iso-image] with qt5ct 0.25 QT_STYLE_OVERRIDE needs to
 be removed

---
 lib/util-iso-image.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index db32c10..94c78d2 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -65,14 +65,14 @@ configure_environment(){
 	case ${profile} in
 		cinnamon*|deepin*|gnome|i3|lxde|mate|netbook|openbox|pantheon|xfce*)
 			echo "QT_STYLE_OVERRIDE=gtk" >> $1/etc/environment
-			if [[ -f "$1/usr/lib/qt/plugins/platformthemes/libqt5ct.so" ]];then
-				sed -i '/QT_STYLE_OVERRIDE=gtk/d' $1/etc/environment
-				echo "QT_QPA_PLATFORMTHEME=qt5ct" >> $1/etc/environment
-			fi
 			if [[ -f "$1/usr/lib/qt/plugins/styles/libqgtk2style.so" ]];then
 				sed -i '/QT_STYLE_OVERRIDE=gtk/d' $1/etc/environment
 				echo "QT_STYLE_OVERRIDE=gtk2" >> $1/etc/environment
 			fi
+			if [[ -f "$1/usr/lib/qt/plugins/platformthemes/libqt5ct.so" ]];then
+				sed -i '/QT_STYLE_OVERRIDE=gtk/d' $1/etc/environment
+				echo "QT_QPA_PLATFORMTHEME=qt5ct" >> $1/etc/environment
+			fi
 		;;
 	esac
 }