From 43ec037c554142b4cf72ef4b49850347cb9ad9f6 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Thu, 26 May 2016 15:29:56 +0200
Subject: [PATCH] Do not load ComboBox items asynchronously

Since there is a bug with Qt 5.5 that will do strange reordering.

Contributes to CURA-1278
---
 resources/qml/Settings/SettingView.qml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index 51f854b519..34b07ce780 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -45,7 +45,9 @@ ScrollView
             property var propertyProvider: provider
 
             //Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989
-            asynchronous: QT_VERSION_STR.split(".")[1] >= 5
+            //In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes,
+            //causing nasty issues when selecting differnt options. So disable asynchronous loading of enum type completely.
+            asynchronous: model.type != "enum"
 
             source:
             {