diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-14 19:01:23 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-12-14 19:01:23 +0100 |
commit | 0e80d28aa5892d6bbb4d0017b1bc9a33489f4176 (patch) | |
tree | 0db2e10c8776d172bccaeaa7ee1fab3934b93073 /examples/quick/localstorage/localstorage/localstorage.qrc | |
parent | ed32558d6280cae40578f735fd326327d571d993 (diff) | |
parent | 16c81bb0d493af00bc376784bcb7e03a4a037b04 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
src/qml/qml/qqmlimport.cpp
src/quick/items/context2d/qquickcontext2dtexture_p.h
tools/qmleasing/splineeditor.h
Change-Id: I8f6630fcac243824350986c8e9f4bd6483bf20b5
Diffstat (limited to 'examples/quick/localstorage/localstorage/localstorage.qrc')
-rw-r--r-- | examples/quick/localstorage/localstorage/localstorage.qrc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/examples/quick/localstorage/localstorage/localstorage.qrc b/examples/quick/localstorage/localstorage/localstorage.qrc index 09ac2de033..079438be2b 100644 --- a/examples/quick/localstorage/localstorage/localstorage.qrc +++ b/examples/quick/localstorage/localstorage/localstorage.qrc @@ -1,6 +1,10 @@ <RCC> - <qresource prefix="/localstorage/localstorage"> - <file>hello.qml</file> + <qresource prefix="/"> + <file>Header.qml</file> + <file>Database.js</file> + <file>MyModel.qml</file> + <file>MyButton.qml</file> + <file>MyDelegate.qml</file> <file>localstorage.qml</file> </qresource> </RCC> |