Fix TabView not to insert duplicate tabs

There are three ways to add tabs:
- declare 'static' Tab { } child elements
- call addTab() / insertTab()
- Component::createObject(tabView)

=> Do not rely on the calling order of Component.onCompleted()
and make sure that the same tabs are not accidentally re-inserted.

Task-number: QTBUG-30873
Change-Id: Ib30cfb676debbb302c5e9f7d757f66aab6fcc684
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

1 files changed, 28 insertions, 11 deletions

diff --git a/tests/auto/controls/data/tst_tabview.qml b/tests/auto/controls/data/tst_tabview.qml
index 973b6fde..ad132265 100644
--- a/tests/auto/controls/data/tst_tabview.qml
+++ b/tests/auto/controls/data/tst_tabview.qml
@@ -192,18 +192,35 @@ TestCase {
     }
 
     function test_dynamicTabs() {
-        var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { property Component tabComponent: Component { Tab { } } }', testCase, '');
-        compare(tabView.count, 0)
-        var tab1 = tabView.tabComponent.createObject(tabView)
-        compare(tabView.count, 1)
-        var tab2 = tabView.tabComponent.createObject(tabView)
-        compare(tabView.count, 2)
-        tab1.destroy()
-        wait(0)
-        compare(tabView.count, 1)
-        tab2.destroy()
+        var test_tabView = '                                \
+        import QtQuick 2.1;                                 \
+        import QtQuick.Controls 1.0;                        \
+        TabView {                                           \
+            id: tabView;                                    \
+            Tab { title: "static" }                         \
+            property Component tabComponent: Component {    \
+                id: tabComponent;                           \
+                Tab { title: "dynamic" }                    \
+            }                                               \
+            Component.onCompleted: {                        \
+                addTab("added", tabComponent);              \
+                insertTab(0, "inserted", tabComponent);     \
+                tabComponent.createObject(tabView);         \
+            }                                               \
+        }                                                   '
+
+        var tabView = Qt.createQmlObject(test_tabView, testCase, '')
+        // insertTab(), addTab(), createObject() and static Tab {}
+        compare(tabView.count, 4)
+        compare(tabView.tabAt(0).title, "inserted")
+
+        var tab = tabView.tabComponent.createObject(tabView)
+        compare(tabView.count, 5)
+        compare(tabView.tabAt(4).title, "dynamic")
+        tab.destroy()
         wait(0)
-        compare(tabView.count, 0)
+        compare(tabView.count, 4)
+        tabView.destroy()
     }
 
     function test_mousePressOnTabBar() {