Rename "qml streams" folder to "qml"

Task-number: QT3DS-3182
Change-Id: Ifb1b7f18b6652d26f38eeab2351c329e7cbeb425
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

6 files changed, 6 insertions, 6 deletions

diff --git a/doc/src/10-best-practices/30-using-sub-presentations.qdoc b/doc/src/10-best-practices/30-using-sub-presentations.qdoc
index 6b33d194..21aff488 100644
--- a/doc/src/10-best-practices/30-using-sub-presentations.qdoc
+++ b/doc/src/10-best-practices/30-using-sub-presentations.qdoc
@@ -68,7 +68,7 @@ To import a sub-presentation, do one of the following:
 
 Sub-presentations will be imported to the folder that is selected in the project palette. If
 no folder is selected, sub-presentations will be imported to the \e{presentations} or
-\e{qml streams} folder depending on the type of the sub-presentation. All assets (such as images,
+\e{qml} folder depending on the type of the sub-presentation. All assets (such as images,
 3D models and effects) and folders of the imported sub-presentation will be imported.
 
 \image {subpresentation-project-structure.png}
diff --git a/examples/studio3d/SampleProject/SampleProject.uia b/examples/studio3d/SampleProject/SampleProject.uia
index 5b7bbffc..f3f79c90 100644
--- a/examples/studio3d/SampleProject/SampleProject.uia
+++ b/examples/studio3d/SampleProject/SampleProject.uia
@@ -2,7 +2,7 @@
 <application>
     <assets initial="SampleProject">
         <presentation id="SampleProject" src="presentations/SampleProject.uip"/>
-        <presentation-qml id="mapView" args="qml streams/Navigation.qml"/>
+        <presentation-qml id="mapView" args="qml/Navigation.qml"/>
         <dataInput max="260" min="0" name="speed" type="Ranged Number"/>
         <dataInput max="7" min="0" name="rpm" type="Ranged Number"/>
         <dataInput name="slide" type="String"/>
diff --git a/examples/studio3d/SampleProject/qml streams/Map.jpg b/examples/studio3d/SampleProject/qml/Map.jpg
index 4db7a3fd..4db7a3fd 100644
--- a/examples/studio3d/SampleProject/qml streams/Map.jpg
+++ b/examples/studio3d/SampleProject/qml/Map.jpg
diff --git a/examples/studio3d/SampleProject/qml streams/Navigation.qml b/examples/studio3d/SampleProject/qml/Navigation.qml
index 7635d985..7635d985 100644
--- a/examples/studio3d/SampleProject/qml streams/Navigation.qml
+++ b/examples/studio3d/SampleProject/qml/Navigation.qml
diff --git a/src/Authoring/Client/Code/Core/Core/Core.cpp b/src/Authoring/Client/Code/Core/Core/Core.cpp
index 6d375843..0e5f2348 100644
--- a/src/Authoring/Client/Code/Core/Core/Core.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Core.cpp
@@ -247,7 +247,7 @@ bool CCore::OnNewDocument(const QString &inDocument, bool isNewProject, bool sil
         dir.mkdir(QStringLiteral("materials"));
         dir.mkdir(QStringLiteral("models"));
         dir.mkdir(QStringLiteral("presentations"));
-        dir.mkdir(QStringLiteral("qml streams"));
+        dir.mkdir(QStringLiteral("qml"));
         dir.mkdir(QStringLiteral("scripts"));
 
         // create the project .uia file
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp
index 875954f3..832f4ddc 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp
+++ b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp
@@ -445,7 +445,7 @@ Q3DStudio::DocumentEditorFileType::Enum ProjectFileSystemModel::assetTypeForRow(
         return Q3DStudio::DocumentEditorFileType::Behavior;
     else if (path == QLatin1String("presentations"))
         return Q3DStudio::DocumentEditorFileType::Presentation;
-    else if (path == QLatin1String("qml streams"))
+    else if (path == QLatin1String("qml"))
         return Q3DStudio::DocumentEditorFileType::QmlStream;
 
     return Q3DStudio::DocumentEditorFileType::Unknown;
@@ -823,7 +823,7 @@ void ProjectFileSystemModel::importUrl(QDir &targetDir, const QUrl &url,
             qmlRoot = getQmlStreamRootNode(qmlEngine, sourceFile, isQmlStream);
             if (qmlRoot) {
                 if (isQmlStream && targetDir.path().endsWith(QLatin1String("/scripts"))) {
-                    const QString path(QStringLiteral("../qml streams"));
+                    const QString path(QStringLiteral("../qml"));
                     targetDir.mkpath(path); // create the folder if doesn't exist
                     targetDir.cd(path);
                 }
@@ -1251,7 +1251,7 @@ void ProjectFileSystemModel::updateDefaultDirMap()
         m_defaultDirToAbsPathMap.insert(QStringLiteral("models"), QString());
         m_defaultDirToAbsPathMap.insert(QStringLiteral("scripts"), QString());
         m_defaultDirToAbsPathMap.insert(QStringLiteral("presentations"), QString());
-        m_defaultDirToAbsPathMap.insert(QStringLiteral("qml streams"), QString());
+        m_defaultDirToAbsPathMap.insert(QStringLiteral("qml"), QString());
     }
 
     const QString rootPath = m_items[0].index.data(QFileSystemModel::FilePathRole).toString();