29 files changed, 39 insertions, 38 deletions
diff --git a/examples/qmlbars/main.cpp b/examples/qmlbars/main.cpp
index 001c5625..54e44634 100644
--- a/examples/qmlbars/main.cpp
+++ b/examples/qmlbars/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 #endif
     viewer.setTitle(QStringLiteral("Monthly income/expenses"));
 
-    viewer.setSource(QUrl("qrc:/qml/main.qml"));
+    viewer.setSource(QUrl("qrc:/qml/qmlbars/main.qml"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
     viewer.show();
 
diff --git a/examples/qmlbars/qml/qmlbars/axes.qml b/examples/qmlbars/qml/qmlbars/Axes.qml
index 29979e1b..29979e1b 100644
--- a/examples/qmlbars/qml/qmlbars/axes.qml
+++ b/examples/qmlbars/qml/qmlbars/Axes.qml
diff --git a/examples/qmlbars/qml/qmlbars/data.qml b/examples/qmlbars/qml/qmlbars/Data.qml
index 7e0978c6..7e0978c6 100644
--- a/examples/qmlbars/qml/qmlbars/data.qml
+++ b/examples/qmlbars/qml/qmlbars/Data.qml
diff --git a/examples/qmlbars/qmlbars.qrc b/examples/qmlbars/qmlbars.qrc
index 7c291fd3..2240fbef 100644
--- a/examples/qmlbars/qmlbars.qrc
+++ b/examples/qmlbars/qmlbars.qrc
@@ -1,7 +1,7 @@
 <RCC>
-    <qresource prefix="/qml">
-        <file alias="Axes.qml">qml/qmlbars/axes.qml</file>
-        <file alias="Data.qml">qml/qmlbars/data.qml</file>
-        <file alias="main.qml">qml/qmlbars/main.qml</file>
+    <qresource prefix="/">
+        <file>qml/qmlbars/Axes.qml</file>
+        <file>qml/qmlbars/Data.qml</file>
+        <file>qml/qmlbars/main.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/qmlcustominput/main.cpp b/examples/qmlcustominput/main.cpp
index fcdd0035..02dd8954 100644
--- a/examples/qmlcustominput/main.cpp
+++ b/examples/qmlcustominput/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 #endif
     viewer.setTitle(QStringLiteral("QML Custom Input"));
 
-    viewer.setSource(QUrl("qrc:/qml/main.qml"));
+    viewer.setSource(QUrl("qrc:/qml/qmlcustominput/main.qml"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
     viewer.show();
 
diff --git a/examples/qmlcustominput/qml/qmlcustominput/data.qml b/examples/qmlcustominput/qml/qmlcustominput/Data.qml
index 201247f1..201247f1 100644
--- a/examples/qmlcustominput/qml/qmlcustominput/data.qml
+++ b/examples/qmlcustominput/qml/qmlcustominput/Data.qml
diff --git a/examples/qmlcustominput/qml/qmlcustominput/newbutton.qml b/examples/qmlcustominput/qml/qmlcustominput/NewButton.qml
index e4fb99d2..e4fb99d2 100644
--- a/examples/qmlcustominput/qml/qmlcustominput/newbutton.qml
+++ b/examples/qmlcustominput/qml/qmlcustominput/NewButton.qml
diff --git a/examples/qmlcustominput/qmlcustominput.qrc b/examples/qmlcustominput/qmlcustominput.qrc
index 5e1ff40c..5800150a 100644
--- a/examples/qmlcustominput/qmlcustominput.qrc
+++ b/examples/qmlcustominput/qmlcustominput.qrc
@@ -1,7 +1,7 @@
 <RCC>
-    <qresource prefix="/qml">
-        <file alias="main.qml">qml/qmlcustominput/main.qml</file>
-        <file alias="Data.qml">qml/qmlcustominput/data.qml</file>
-        <file alias="NewButton.qml">qml/qmlcustominput/newbutton.qml</file>
+    <qresource prefix="/">
+        <file>qml/qmlcustominput/Data.qml</file>
+        <file>qml/qmlcustominput/main.qml</file>
+        <file>qml/qmlcustominput/NewButton.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/qmllegend/main.cpp b/examples/qmllegend/main.cpp
index 954affe4..f3210dd7 100644
--- a/examples/qmllegend/main.cpp
+++ b/examples/qmllegend/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 #endif
     viewer.setTitle(QStringLiteral("Legend example"));
 
-    viewer.setSource(QUrl("qrc:/qml/main.qml"));
+    viewer.setSource(QUrl("qrc:/qml/qmllegend/main.qml"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
     viewer.show();
 
diff --git a/examples/qmllegend/qml/qmllegend/data.qml b/examples/qmllegend/qml/qmllegend/Data.qml
index 4681c61c..4681c61c 100644
--- a/examples/qmllegend/qml/qmllegend/data.qml
+++ b/examples/qmllegend/qml/qmllegend/Data.qml
diff --git a/examples/qmllegend/qml/qmllegend/legenditem.qml b/examples/qmllegend/qml/qmllegend/LegendItem.qml
index 50be7a8d..50be7a8d 100644
--- a/examples/qmllegend/qml/qmllegend/legenditem.qml
+++ b/examples/qmllegend/qml/qmllegend/LegendItem.qml
diff --git a/examples/qmllegend/qml/qmllegend/newbutton.qml b/examples/qmllegend/qml/qmllegend/NewButton.qml
index e4fb99d2..e4fb99d2 100644
--- a/examples/qmllegend/qml/qmllegend/newbutton.qml
+++ b/examples/qmllegend/qml/qmllegend/NewButton.qml
diff --git a/examples/qmllegend/qmllegend.qrc b/examples/qmllegend/qmllegend.qrc
index 6496cfdb..b9777b37 100644
--- a/examples/qmllegend/qmllegend.qrc
+++ b/examples/qmllegend/qmllegend.qrc
@@ -1,8 +1,8 @@
 <RCC>
-    <qresource prefix="/qml">
-        <file alias="Data.qml">qml/qmllegend/data.qml</file>
-        <file alias="main.qml">qml/qmllegend/main.qml</file>
-        <file alias="LegendItem.qml">qml/qmllegend/legenditem.qml</file>
-        <file alias="NewButton.qml">qml/qmllegend/newbutton.qml</file>
+    <qresource prefix="/">
+        <file>qml/qmllegend/Data.qml</file>
+        <file>qml/qmllegend/LegendItem.qml</file>
+        <file>qml/qmllegend/main.qml</file>
+        <file>qml/qmllegend/NewButton.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/qmlmultigraph/main.cpp b/examples/qmlmultigraph/main.cpp
index 25cd5d9c..12c52019 100644
--- a/examples/qmlmultigraph/main.cpp
+++ b/examples/qmlmultigraph/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
                                                                        QString::fromLatin1("lib")));
 #endif
     viewer.setTitle(QStringLiteral("QML multigraph example"));
-    viewer.setSource(QUrl("qrc:/qml/main.qml"));
+    viewer.setSource(QUrl("qrc:/qml/qmlmultigraph/main.qml"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
     viewer.showExpanded();
 
diff --git a/examples/qmlmultigraph/qml/qmlmultigraph/data.qml b/examples/qmlmultigraph/qml/qmlmultigraph/Data.qml
index 51bee741..51bee741 100644
--- a/examples/qmlmultigraph/qml/qmlmultigraph/data.qml
+++ b/examples/qmlmultigraph/qml/qmlmultigraph/Data.qml
diff --git a/examples/qmlmultigraph/qml/qmlmultigraph/newbutton.qml b/examples/qmlmultigraph/qml/qmlmultigraph/NewButton.qml
index e4fb99d2..e4fb99d2 100644
--- a/examples/qmlmultigraph/qml/qmlmultigraph/newbutton.qml
+++ b/examples/qmlmultigraph/qml/qmlmultigraph/NewButton.qml
diff --git a/examples/qmlmultigraph/qmlmultigraph.qrc b/examples/qmlmultigraph/qmlmultigraph.qrc
index 02e0c682..c5e63a1c 100644
--- a/examples/qmlmultigraph/qmlmultigraph.qrc
+++ b/examples/qmlmultigraph/qmlmultigraph.qrc
@@ -1,7 +1,7 @@
 <RCC>
-    <qresource prefix="/qml">
-        <file alias="main.qml">qml/qmlmultigraph/main.qml</file>
-        <file alias="NewButton.qml">qml/qmlmultigraph/newbutton.qml</file>
-        <file alias="Data.qml">qml/qmlmultigraph/data.qml</file>
+    <qresource prefix="/">
+        <file>qml/qmlmultigraph/Data.qml</file>
+        <file>qml/qmlmultigraph/main.qml</file>
+        <file>qml/qmlmultigraph/NewButton.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/qmlscatter/main.cpp b/examples/qmlscatter/main.cpp
index 4ecefdc1..38422cb3 100644
--- a/examples/qmlscatter/main.cpp
+++ b/examples/qmlscatter/main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
 #endif
     viewer.setTitle(QStringLiteral("QML scatter example"));
     //! [0]
-    viewer.setSource(QUrl("qrc:/qml/main.qml"));
+    viewer.setSource(QUrl("qrc:/qml/qmlscatter/main.qml"));
     //! [0]
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
     //! [1]
diff --git a/examples/qmlscatter/qml/qmlscatter/data.qml b/examples/qmlscatter/qml/qmlscatter/Data.qml
index 23c4e5d5..23c4e5d5 100644
--- a/examples/qmlscatter/qml/qmlscatter/data.qml
+++ b/examples/qmlscatter/qml/qmlscatter/Data.qml
diff --git a/examples/qmlscatter/qml/qmlscatter/newbutton.qml b/examples/qmlscatter/qml/qmlscatter/NewButton.qml
index e4fb99d2..e4fb99d2 100644
--- a/examples/qmlscatter/qml/qmlscatter/newbutton.qml
+++ b/examples/qmlscatter/qml/qmlscatter/NewButton.qml
diff --git a/examples/qmlscatter/qmlscatter.qrc b/examples/qmlscatter/qmlscatter.qrc
index 6b77a4bc..225d78b0 100644
--- a/examples/qmlscatter/qmlscatter.qrc
+++ b/examples/qmlscatter/qmlscatter.qrc
@@ -1,7 +1,7 @@
 <RCC>
-    <qresource prefix="/qml">
-        <file alias="main.qml">qml/qmlscatter/main.qml</file>
-        <file alias="Data.qml">qml/qmlscatter/data.qml</file>
-        <file alias="NewButton.qml">qml/qmlscatter/newbutton.qml</file>
+    <qresource prefix="/">
+        <file>qml/qmlscatter/Data.qml</file>
+        <file>qml/qmlscatter/main.qml</file>
+        <file>qml/qmlscatter/NewButton.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/qmlsurface/main.cpp b/examples/qmlsurface/main.cpp
index 03518d00..bddd1518 100644
--- a/examples/qmlsurface/main.cpp
+++ b/examples/qmlsurface/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
                                                                        QString::fromLatin1("lib")));
 #endif
 
-    viewer.setSource(QUrl("qrc:/qml/main.qml"));
+    viewer.setSource(QUrl("qrc:/qml/qml/qmlsurface/main.qml"));
 
     viewer.setTitle(QStringLiteral("Tycho crater on the Moon (height exaggerated)"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
diff --git a/examples/qmlsurface/qml/qmlsurface/data.qml b/examples/qmlsurface/qml/qmlsurface/Data.qml
index 5fd4ece8..5fd4ece8 100644
--- a/examples/qmlsurface/qml/qmlsurface/data.qml
+++ b/examples/qmlsurface/qml/qmlsurface/Data.qml
diff --git a/examples/qmlsurface/qml/qmlsurface/newbutton.qml b/examples/qmlsurface/qml/qmlsurface/NewButton.qml
index e4fb99d2..e4fb99d2 100644
--- a/examples/qmlsurface/qml/qmlsurface/newbutton.qml
+++ b/examples/qmlsurface/qml/qmlsurface/NewButton.qml
diff --git a/examples/qmlsurface/qmlsurface.qrc b/examples/qmlsurface/qmlsurface.qrc
index d0745b94..c27f2d56 100644
--- a/examples/qmlsurface/qmlsurface.qrc
+++ b/examples/qmlsurface/qmlsurface.qrc
@@ -1,8 +1,8 @@
 <RCC>
     <qresource prefix="/qml">
-        <file alias="main.qml">qml/qmlsurface/main.qml</file>
-        <file alias="Data.qml">qml/qmlsurface/data.qml</file>
-        <file alias="NewButton.qml">qml/qmlsurface/newbutton.qml</file>
+        <file>qml/qmlsurface/main.qml</file>
+        <file>qml/qmlsurface/Data.qml</file>
+        <file>qml/qmlsurface/NewButton.qml</file>
     </qresource>
     <qresource prefix="/heightmaps">
         <file alias="image">heightmap.png</file>
diff --git a/tests/qmlcamera/qmlcamera.qrc b/tests/qmlcamera/qmlcamera.qrc
index d9b993c7..90cb0867 100644
--- a/tests/qmlcamera/qmlcamera.qrc
+++ b/tests/qmlcamera/qmlcamera.qrc
@@ -1,7 +1,8 @@
 <RCC>
-    <qresource prefix="/qml">
-        <file alias="main.qml">qml/qmlcamera/main.qml</file>
-        <file alias="Data.qml">qml/qmlcamera/Data.qml</file>
-        <file alias="Axes.qml">qml/qmlcamera/Axes.qml</file>
+    <qresource prefix="/">
+        <file>qml/qmlcamera/Axes.qml</file>
+        <file>qml/qmlcamera/ControlSurface.qml</file>
+        <file>qml/qmlcamera/Data.qml</file>
+        <file>qml/qmlcamera/main.qml</file>
     </qresource>
 </RCC>
diff --git a/tests/qmldynamicdata/main.cpp b/tests/qmldynamicdata/main.cpp
index 7c9bcf86..c6bbd9e8 100644
--- a/tests/qmldynamicdata/main.cpp
+++ b/tests/qmldynamicdata/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 #endif
     viewer.setTitle(QStringLiteral("QML Dynamic Data Test"));
 
-    viewer.setSource(QUrl("qrc:/qml/main.qml"));
+    viewer.setSource(QUrl("qrc:/qml/qmldynamicdata/main.qml"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
     viewer.show();
 
diff --git a/tests/qmldynamicdata/qml/qmldynamicdata/newbutton.qml b/tests/qmldynamicdata/qml/qmldynamicdata/NewButton.qml
index 0b792dbf..0b792dbf 100644
--- a/tests/qmldynamicdata/qml/qmldynamicdata/newbutton.qml
+++ b/tests/qmldynamicdata/qml/qmldynamicdata/NewButton.qml
diff --git a/tests/qmldynamicdata/qmldynamicdata.qrc b/tests/qmldynamicdata/qmldynamicdata.qrc
index 3a13d7b4..76641cf9 100644
--- a/tests/qmldynamicdata/qmldynamicdata.qrc
+++ b/tests/qmldynamicdata/qmldynamicdata.qrc
@@ -1,6 +1,6 @@
 <RCC>
-    <qresource prefix="/qml">
-        <file alias="main.qml">qml/qmldynamicdata/main.qml</file>
-        <file alias="NewButton.qml">qml/qmldynamicdata/newbutton.qml</file>
+    <qresource prefix="/">
+        <file>qml/qmldynamicdata/main.qml</file>
+        <file>qml/qmldynamicdata/NewButton.qml</file>
     </qresource>
 </RCC>