diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
| commit | e4dc3567af533df2e57425952c4609726515d2cd (patch) | |
| tree | 72824b5efc9a4d6ed9f099d34404076245e164fa /examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc | |
| parent | a36e8ca7afd0c15e5ec73bf4ea21464ab89a3662 (diff) | |
| parent | dbfedcb31961579499fcb5342ccc42311191bcd4 (diff) | |
| download | Qt-e4dc3567af533df2e57425952c4609726515d2cd.zip Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.gz Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.bz2 | |
Merge remote branch 'origin/master'
Conflicts:
src/gui/dialogs/qnspanelproxy_mac.mm
Diffstat (limited to 'examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc')
| -rw-r--r-- | examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc new file mode 100644 index 0000000..e2fa01d --- /dev/null +++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>example.qml</file> +</qresource> +</RCC> |