diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 05:27:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 05:27:24 (GMT) |
| commit | 8abe00029fddc0f54c2c5afeda488a76182fd95c (patch) | |
| tree | 1982261606862535481b083f68eac1ba795cc614 /demos/qtdemo/qtdemo.qrc | |
| parent | 55664a0ef4b88b67c9931c7d2f6853e5fa0a9716 (diff) | |
| parent | d982ded10a3dd5219ae40a5a3574b63ac7bdda3f (diff) | |
| download | Qt-8abe00029fddc0f54c2c5afeda488a76182fd95c.zip Qt-8abe00029fddc0f54c2c5afeda488a76182fd95c.tar.gz Qt-8abe00029fddc0f54c2c5afeda488a76182fd95c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Always pass context to QObject script class
Reading/writing a non-existent property throws an exception
Fix
geolocation (untested)
Doc
License header.
Example of a simple TextEditor look-and-feel.
Fix benchmark warnings on symbian.
Fix TextEdit implicit height.
Integrate some QML examples and demos into qtdemo
Fix typo
Diffstat (limited to 'demos/qtdemo/qtdemo.qrc')
| -rw-r--r-- | demos/qtdemo/qtdemo.qrc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/demos/qtdemo/qtdemo.qrc b/demos/qtdemo/qtdemo.qrc index b30dd58..7682ab5 100644 --- a/demos/qtdemo/qtdemo.qrc +++ b/demos/qtdemo/qtdemo.qrc @@ -1,8 +1,12 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource prefix="/"> - <file>xml/examples.xml</file> - <file>images/qtlogo_small.png</file> - <file>images/trolltech-logo.png</file> - <file>images/demobg.png</file> -</qresource> +<RCC> + <qresource prefix="/"> + <file>xml/examples.xml</file> + <file>images/qtlogo_small.png</file> + <file>images/trolltech-logo.png</file> + <file>images/demobg.png</file> + </qresource> + <qresource prefix="/qml" lang="qml"> + <file>qmlShell.qml</file> + <file>MagicAnim.qml</file> + </qresource> </RCC> |