From 20945586166c9e5804de24d79ae0e998e21a088c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Mon, 3 Feb 2014 09:08:35 +0200
Subject: QML filename corrections
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I3f24a75fd59e342a0dcb9d4cf325e3cf735ae653
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 tests/qmlcamera/qmlcamera.qrc                      |  9 +++--
 tests/qmldynamicdata/main.cpp                      |  2 +-
 .../qml/qmldynamicdata/NewButton.qml               | 43 ++++++++++++++++++++++
 .../qml/qmldynamicdata/newbutton.qml               | 43 ----------------------
 tests/qmldynamicdata/qmldynamicdata.qrc            |  6 +--
 5 files changed, 52 insertions(+), 51 deletions(-)
 create mode 100644 tests/qmldynamicdata/qml/qmldynamicdata/NewButton.qml
 delete mode 100644 tests/qmldynamicdata/qml/qmldynamicdata/newbutton.qml

(limited to 'tests')

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
new file mode 100644
index 00000000..0b792dbf
--- /dev/null
+++ b/tests/qmldynamicdata/qml/qmldynamicdata/NewButton.qml
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.1
+import QtQuick.Controls 1.0
+
+Item {
+    id: newbutton
+
+    property alias text: buttonText.text
+
+    signal clicked
+
+    height: 80
+
+    Button {
+        width: parent.width
+        height: parent.height
+        Text {
+            id: buttonText
+            wrapMode: Text.WordWrap
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+            anchors.fill: parent
+        }
+        onClicked: newbutton.clicked()
+    }
+}
diff --git a/tests/qmldynamicdata/qml/qmldynamicdata/newbutton.qml b/tests/qmldynamicdata/qml/qmldynamicdata/newbutton.qml
deleted file mode 100644
index 0b792dbf..00000000
--- a/tests/qmldynamicdata/qml/qmldynamicdata/newbutton.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVisualization module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-
-Item {
-    id: newbutton
-
-    property alias text: buttonText.text
-
-    signal clicked
-
-    height: 80
-
-    Button {
-        width: parent.width
-        height: parent.height
-        Text {
-            id: buttonText
-            wrapMode: Text.WordWrap
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            anchors.fill: parent
-        }
-        onClicked: newbutton.clicked()
-    }
-}
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>
-- 
cgit v1.2.3