diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-03 09:08:35 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-03 09:09:06 +0200 |
| commit | 20945586166c9e5804de24d79ae0e998e21a088c (patch) | |
| tree | cc7671a77bcad4f345b3b9877d260e1b4fd6c4be /tests | |
| parent | e95504804eb5eadafaed1253e7d56284a8758ae9 (diff) | |
QML filename corrections
Change-Id: I3f24a75fd59e342a0dcb9d4cf325e3cf735ae653
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qmlcamera/qmlcamera.qrc | 9 | ||||
| -rw-r--r-- | tests/qmldynamicdata/main.cpp | 2 | ||||
| -rw-r--r-- | tests/qmldynamicdata/qml/qmldynamicdata/NewButton.qml (renamed from tests/qmldynamicdata/qml/qmldynamicdata/newbutton.qml) | 0 | ||||
| -rw-r--r-- | tests/qmldynamicdata/qmldynamicdata.qrc | 6 |
4 files changed, 9 insertions, 8 deletions
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> |