diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-14 08:14:40 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-14 08:14:40 (GMT) |
| commit | 62cd360b3f2ef9e9787359a9105fd805b721b49f (patch) | |
| tree | 8bb7dd87f0914d59d94d688c32e9244ebb79cbad /tests/auto/qscriptengine/qscriptengine.qrc | |
| parent | 4af9cc043370846c52ec21cf874696ee650394c1 (diff) | |
| parent | 0dbd8f1b0a6df20e5502bb35e58490a9f99953a7 (diff) | |
| download | Qt-62cd360b3f2ef9e9787359a9105fd805b721b49f.zip Qt-62cd360b3f2ef9e9787359a9105fd805b721b49f.tar.gz Qt-62cd360b3f2ef9e9787359a9105fd805b721b49f.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/script/api/qscriptengine.cpp
Diffstat (limited to 'tests/auto/qscriptengine/qscriptengine.qrc')
| -rw-r--r-- | tests/auto/qscriptengine/qscriptengine.qrc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qscriptengine/qscriptengine.qrc b/tests/auto/qscriptengine/qscriptengine.qrc new file mode 100644 index 0000000..b87f985 --- /dev/null +++ b/tests/auto/qscriptengine/qscriptengine.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>translations/translatable_la.qm</file> +</qresource> +</RCC> |