diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-09 06:24:35 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-09 06:24:35 (GMT) |
| commit | 32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba (patch) | |
| tree | 6a33a5221b2f37dfa9782739b0b456cd7496a10b /examples/script/helloscript/main.cpp | |
| parent | 120a12f5dc13dea327cdbbbc94b58f29d1f3306b (diff) | |
| parent | f59908d4a6edcd333a156d4c94ddbd9b30f7e810 (diff) | |
| download | Qt-32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba.zip Qt-32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba.tar.gz Qt-32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 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); |