diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-12-07 05:08:30 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-12-07 05:08:30 (GMT) |
commit | 569dfab376d9f63422791566d1888618934ffdc3 (patch) | |
tree | 7098d0e33f0cdb19b144f33318210bf801575c42 /examples/script/helloscript/main.cpp | |
parent | e68fa8d463ff10f7eb2b486362ef73eea9271ff8 (diff) | |
parent | bd23da275dc88951e17137ef02147c9b5499bce7 (diff) | |
download | Qt-569dfab376d9f63422791566d1888618934ffdc3.zip Qt-569dfab376d9f63422791566d1888618934ffdc3.tar.gz Qt-569dfab376d9f63422791566d1888618934ffdc3.tar.bz2 |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/script/helloscript/main.cpp')
-rw-r--r-- | examples/script/helloscript/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/script/helloscript/main.cpp b/examples/script/helloscript/main.cpp index bc9a65e..55d63bf 100644 --- a/examples/script/helloscript/main.cpp +++ b/examples/script/helloscript/main.cpp @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) //! [2] //! [3] - QString fileName(":/helloscript.qs"); + QString fileName(":/helloscript.js"); QFile scriptFile(fileName); scriptFile.open(QIODevice::ReadOnly); QTextStream stream(&scriptFile); |