diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-12-04 16:00:13 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-12-04 16:00:13 (GMT) |
| commit | 0ec20e4fdd70dc11df5932ea2c282efce21dee15 (patch) | |
| tree | 7387b1db111bb0930e6e01c0b405112a0b317343 /examples/script/helloscript/helloscript.qrc | |
| parent | 8577da4a70be7400b1dc7d2265a31de46f8e8bb9 (diff) | |
| parent | 33441e2a611f07207b0b942368aab9010cdf8ab1 (diff) | |
| download | Qt-0ec20e4fdd70dc11df5932ea2c282efce21dee15.zip Qt-0ec20e4fdd70dc11df5932ea2c282efce21dee15.tar.gz Qt-0ec20e4fdd70dc11df5932ea2c282efce21dee15.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'examples/script/helloscript/helloscript.qrc')
| -rw-r--r-- | examples/script/helloscript/helloscript.qrc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/script/helloscript/helloscript.qrc b/examples/script/helloscript/helloscript.qrc index dc93461..c52fa15 100644 --- a/examples/script/helloscript/helloscript.qrc +++ b/examples/script/helloscript/helloscript.qrc @@ -1,5 +1,5 @@ <RCC> <qresource prefix="/" > - <file>helloscript.qs</file> + <file>helloscript.js</file> </qresource> </RCC> |