From ba7016ab1e2eccdb32764a28c88971de7e52c474 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Tue, 28 Jun 2016 15:57:02 +0200
Subject: [PATCH] QmlDesigner: Fix UrlChoser

We have to set currentIndex to -1 if the url is not in the model.

Task-number: QTCREATORBUG-16494
Change-Id: I031a4f99d83b35ea1c0b805194b6aa42338f6509
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../HelperWidgets/UrlChooser.qml              | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
index 2c2e4087c60..74320b4dbbc 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
@@ -54,9 +54,20 @@ RowLayout {
 
         property bool isComplete: false
 
-        property string textValue: backendValue.value
+        function setCurrentText(text) {
+            if (text === "")
+                return
+
+
+            var index = comboBox.find(textValue)
+            if (index === -1)
+                currentIndex = -1
+            editText = textValue
+        }
+
+        property string textValue: backendValue.valueToString
         onTextValueChanged: {
-            comboBox.editText = textValue
+            setCurrentText(textValue)
         }
 
         Layout.fillWidth: true
@@ -72,7 +83,7 @@ RowLayout {
             if (!comboBox.isComplete)
                 return;
 
-            editText = backendValue.valueToString
+            setCurrentText(textValue)
         }
 
         onCurrentTextChanged: {
@@ -95,7 +106,7 @@ RowLayout {
                 }
             }
             comboBox.isComplete = true
-            editText = backendValue.valueToString
+            setCurrentText(textValue)
         }
 
     }