diff options
author | Bill King <bill.king@nokia.com> | 2009-12-02 22:41:34 (GMT) |
---|---|---|
committer | Bill King <bill.king@nokia.com> | 2009-12-02 22:41:34 (GMT) |
commit | 82a63405863f527028302ceaeff957f9ee5176e2 (patch) | |
tree | 445dc288777f9861611405e21c7e650c52255300 /examples/script/helloscript/main.cpp | |
parent | 825c7cf9d5d8e83074636c2feeefc15a3062781d (diff) | |
parent | f29f1bb287c6b39bd1270802d1579f1c1d53f905 (diff) | |
download | Qt-82a63405863f527028302ceaeff957f9ee5176e2.zip Qt-82a63405863f527028302ceaeff957f9ee5176e2.tar.gz Qt-82a63405863f527028302ceaeff957f9ee5176e2.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
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); |