Do not use a qml subfolder for qtquick applications.

The subfolder triggers some unfortunate issues, like that the default
path that is chosen for adding files to the '/' prefix in the qrc is the
project directory.

Change-Id: Ia0010e01c37afb64506053014eae4524794e57d8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

15 files changed, 10 insertions, 10 deletions

diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/main.cpp b/share/qtcreator/templates/qtquick/qtquick_1_1/main.cpp
index 04db135b9f..46d3ef8e8d 100644
--- a/share/qtcreator/templates/qtquick/qtquick_1_1/main.cpp
+++ b/share/qtcreator/templates/qtquick/qtquick_1_1/main.cpp
@@ -8,7 +8,7 @@ int main(int argc, char *argv[])
     QtQuick1ApplicationViewer viewer;
     viewer.addImportPath(QLatin1String("modules")); // ADDIMPORTPATH
     viewer.setOrientation(QtQuick1ApplicationViewer::ScreenOrientationAuto); // ORIENTATION
-    viewer.setMainQmlFile(QLatin1String("qrc:///qml/main.qml")); // MAINQML
+    viewer.setMainQmlFile(QLatin1String("qrc:///main.qml")); // MAINQML
     viewer.showExpanded();
 
     return app.exec();
diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/qml/main.qml b/share/qtcreator/templates/qtquick/qtquick_1_1/main.qml
index 07c789d6d1..07c789d6d1 100644
--- a/share/qtcreator/templates/qtquick/qtquick_1_1/qml/main.qml
+++ b/share/qtcreator/templates/qtquick/qtquick_1_1/main.qml
diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/qml.qrc b/share/qtcreator/templates/qtquick/qtquick_1_1/qml.qrc
index 69145a822f..5f6483ac33 100644
--- a/share/qtcreator/templates/qtquick/qtquick_1_1/qml.qrc
+++ b/share/qtcreator/templates/qtquick/qtquick_1_1/qml.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_1/main.cpp b/share/qtcreator/templates/qtquick/qtquick_2_1/main.cpp
index 51f46ef657..d6e3d99554 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_1/main.cpp
+++ b/share/qtcreator/templates/qtquick/qtquick_2_1/main.cpp
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
 
     return app.exec();
 }
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_1/qml/main.qml b/share/qtcreator/templates/qtquick/qtquick_2_1/main.qml
index 405aa668f9..405aa668f9 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_1/qml/main.qml
+++ b/share/qtcreator/templates/qtquick/qtquick_2_1/main.qml
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_1/qml.qrc b/share/qtcreator/templates/qtquick/qtquick_2_1/qml.qrc
index 69145a822f..5f6483ac33 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_1/qml.qrc
+++ b/share/qtcreator/templates/qtquick/qtquick_2_1/qml.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_2/main.cpp b/share/qtcreator/templates/qtquick/qtquick_2_2/main.cpp
index 51f46ef657..d6e3d99554 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_2/main.cpp
+++ b/share/qtcreator/templates/qtquick/qtquick_2_2/main.cpp
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
 
     return app.exec();
 }
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_2/qml/main.qml b/share/qtcreator/templates/qtquick/qtquick_2_2/main.qml
index f09ac33406..f09ac33406 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_2/qml/main.qml
+++ b/share/qtcreator/templates/qtquick/qtquick_2_2/main.qml
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_2/qml.qrc b/share/qtcreator/templates/qtquick/qtquick_2_2/qml.qrc
index 69145a822f..5f6483ac33 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_2/qml.qrc
+++ b/share/qtcreator/templates/qtquick/qtquick_2_2/qml.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.cpp b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.cpp
index 978245ab39..a22e2e8d3c 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.cpp
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.cpp
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
 
     return app.exec();
 }
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml/main.qml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.qml
index 2e6b1dd3d0..2e6b1dd3d0 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml/main.qml
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/main.qml
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml.qrc b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml.qrc
index 69145a822f..5f6483ac33 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml.qrc
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/qml.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.cpp b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.cpp
index 978245ab39..a22e2e8d3c 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.cpp
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.cpp
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
 
     return app.exec();
 }
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml/main.qml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.qml
index 4187749b5f..4187749b5f 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml/main.qml
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/main.qml
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml.qrc b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml.qrc
index 69145a822f..5f6483ac33 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml.qrc
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
+        <file>main.qml</file>
     </qresource>
 </RCC>