summaryrefslogtreecommitdiffstats
path: root/examples/script/helloscript/main.cpp
diff options
context:
space:
mode:
authorck <qt-info@nokia.com>2009-12-03 13:38:49 (GMT)
committerck <qt-info@nokia.com>2009-12-03 13:38:49 (GMT)
commit6aee4cbee38e007fb8141de7d577aa73e5734ef5 (patch)
tree964e929477cb27f9de271dfd08f2da88eb338981 /examples/script/helloscript/main.cpp
parentd6c21efa5b67fc55f9edfa4aabeb48adf68ee131 (diff)
parent3f18623dd8f26857d9af032c41095818f5346910 (diff)
downloadQt-6aee4cbee38e007fb8141de7d577aa73e5734ef5.zip
Qt-6aee4cbee38e007fb8141de7d577aa73e5734ef5.tar.gz
Qt-6aee4cbee38e007fb8141de7d577aa73e5734ef5.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'examples/script/helloscript/main.cpp')
-rw-r--r--examples/script/helloscript/main.cpp2
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);