ComboBox: Get proper label when setting selectedIndex

Change-Id: I8fb92b95adc713c00ffd56bc892abcdd24269100
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>

examples/gallery/content/Controls.qml

@@ -77,6 +77,7 @@ Item {
                 id: combo;
                 model: choices;
                 width: parent.width;
+                selectedIndex: 2
                 KeyNavigation.tab: t1
             }
             Row {

src/qtdesktop/ContextMenu.qml

@@ -43,7 +43,7 @@ import QtDesktop 1.0
 
 Menu {
     id: root
-    property string selectedText: itemTextAt(selectedIndex)
+    property string selectedText: menuItems[selectedIndex] ? menuItems[selectedIndex].text : ""
     property string textRole
 
     onModelChanged: if (Component.status === Component.Ready && model !== undefined) rebuildMenu()

src/qtdesktop/qtmenu_p.h

@@ -83,7 +83,7 @@ public:
     Q_INVOKABLE void showPopup(qreal x, qreal y, int atActionIndex = -1, QObject *reference = 0);
     Q_INVOKABLE void clearMenuItems();
     Q_INVOKABLE QtMenuItem *addMenuItem(const QString &text);
-    Q_INVOKABLE QString itemTextAt(int index) const;
+    Q_INVOKABLE QString itemTextAt(int index) const; // TODO Remove, it's useless
     Q_INVOKABLE QString modelTextAt(int index) const;
     Q_INVOKABLE int modelCount() const;