Fix adding created objects to instantiator.

Before all new objects were pushed into the end of QVector,
i.e. if item model changes object with low index newly created object
will be added like it has big index. So, removing objects from
instantiator was buggy.

Task-number: QTBUG-33847.
Change-Id: I49fba53a40fce72060b629f737c10b525c67cc86
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>

1 files changed, 126 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlinstantiator/stringmodel.h b/tests/auto/qml/qqmlinstantiator/stringmodel.h
new file mode 100644
index 0000000000..c66aa5886a
--- /dev/null
+++ b/tests/auto/qml/qqmlinstantiator/stringmodel.h
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Dmitrii Kosarev aka Kakadu <kakadu.hafanana@gmail.com>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef STRINGMODEL_H
+#define STRINGMODEL_H
+
+#include <QtCore/QObject>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QDebug>
+
+class StringModel : public QAbstractItemModel
+{
+    Q_OBJECT
+    QVector<QString> items;
+    QHash<int, QByteArray> roles;
+    QString name;
+
+public:
+    explicit StringModel(const QString& name) : QAbstractItemModel(), name(name)
+    {
+        roles.insert(555, "text");
+    }
+
+    void drop(int count)
+    {
+        beginRemoveRows(QModelIndex(), 0, count-1);
+        for (int i=0; i<count; i++)
+            items.pop_front();
+        endRemoveRows();
+    }
+
+    Q_INVOKABLE void add(QString s)
+    {
+        beginInsertRows(QModelIndex(), 0, 0);
+        items.push_front(s);
+        endInsertRows();
+    }
+
+    int rowCount(const QModelIndex &) const
+    {
+        return items.count();
+    }
+
+    virtual QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE
+    {
+        return roles;
+    }
+
+    virtual int columnCount(const QModelIndex &) const
+    {
+        return 1;
+    }
+
+    virtual bool hasChildren(const QModelIndex &) const Q_DECL_OVERRIDE
+    {
+        return rowCount(QModelIndex()) > 0;
+    }
+
+    virtual QModelIndex index(int row, int column, const QModelIndex &parent) const
+    {
+        Q_UNUSED(column);
+        if (row>=0 && row<rowCount(parent))
+            return createIndex(row,0);
+        else
+            return QModelIndex();
+    }
+
+    virtual QModelIndex parent(const QModelIndex &) const
+    {
+        return QModelIndex();
+    }
+
+    QVariant data (const QModelIndex & index, int role) const
+    {
+        int row = index.row();
+        if ((row<0) || (row>=items.count()))
+            return QVariant::Invalid;
+
+        switch (role) {
+        case Qt::DisplayRole:
+        case 555:
+            return QVariant::fromValue(items.at(row));
+        default:
+            return QVariant();
+        }
+    }
+};
+
+#endif // STRINGMODEL_H