diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-24 19:02:51 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-24 19:26:34 (GMT) |
| commit | 3af5a362a034fe7f9085a202adfdf13252de1715 (patch) | |
| tree | de73840eb45305dbc20f7185549eb163d1e900b9 /demos/qtdemo/qtdemo.qrc | |
| parent | 3003f1d885e732e7cc19f73f9733aa8102b70717 (diff) | |
| download | Qt-3af5a362a034fe7f9085a202adfdf13252de1715.zip Qt-3af5a362a034fe7f9085a202adfdf13252de1715.tar.gz Qt-3af5a362a034fe7f9085a202adfdf13252de1715.tar.bz2 | |
Integrate some QML examples and demos into qtdemo
Includes minor changes and additions to the existing doc and examples,
so that they follow Qt conventions better.
Note that while blurring the background was part of the plan for the
embedded QML viewer I could not get it to perform well enough. In the
future, when blur is fast enough (or someone else can get it to
perform better than I) -use-blur should become the default, and
-no-blur the option.
Task-number: QTBUG-10582
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> |