QmlDesigner.NodeInstances: Move context object to a context directory

filename_contextdummy.qml -> context/filename.qml

Task-number: QTCREATORBUG-5630
Change-Id: I76ae5432ff3052d17a3cec17d85b5cbb6d1ddc61
Reviewed-on: http://codereview.qt.nokia.com/2295
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

2 files changed, 14 insertions, 5 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
index 1bf52e049e5..694d95cc994 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
@@ -395,8 +395,10 @@ void NodeInstanceServer::setupDummyData(const QUrl &fileUrl)
 {
     if (!fileUrl.isEmpty()) {
         QStringList dummyDataDirectoryList = dummyDataDirectories(QFileInfo(fileUrl.toLocalFile()).path());
-        foreach (const QString &dummyDataDirectory, dummyDataDirectoryList)
+        foreach (const QString &dummyDataDirectory, dummyDataDirectoryList) {
             loadDummyDataFiles(dummyDataDirectory);
+            loadDummyDataContext(dummyDataDirectory);
+        }
     }
 }
 
@@ -1078,13 +1080,19 @@ void NodeInstanceServer::loadDummyDataFiles(const QString& directory)
 {
     QDir dir(directory, "*.qml");
     QList<QFileInfo> filePathList = dir.entryInfoList();
+    foreach (const QFileInfo &qmlFileInfo, filePathList) {
+        loadDummyDataFile(qmlFileInfo);
+    }
+}
+
+void NodeInstanceServer::loadDummyDataContext(const QString& directory)
+{
+    QDir dir(directory+"/context", "*.qml");
+    QList<QFileInfo> filePathList = dir.entryInfoList();
     QString baseName = QFileInfo(fileUrl().toLocalFile()).completeBaseName();
     foreach (const QFileInfo &qmlFileInfo, filePathList) {
-        if (!qmlFileInfo.completeBaseName().contains("_dummycontext")) {
-            loadDummyDataFile(qmlFileInfo);
-        } else if (qmlFileInfo.completeBaseName() == baseName+"_dummycontext") {
+        if (qmlFileInfo.completeBaseName() == baseName)
             loadDummyContextObjectFile(qmlFileInfo);
-        }
     }
 }
 
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h
index ea24316fda1..d9c49b35bf6 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h
@@ -172,6 +172,7 @@ protected:
     virtual void initializeView(const QVector<AddImportContainer> &importVector) = 0;
     virtual QList<ServerNodeInstance> setupScene(const CreateSceneCommand &command) = 0;
     void loadDummyDataFiles(const QString& directory);
+    void loadDummyDataContext(const QString& directory);
     void loadDummyDataFile(const QFileInfo& fileInfo);
     void loadDummyContextObjectFile(const QFileInfo& fileInfo);
     static QStringList dummyDataDirectories(const QString& directoryPath);