diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-04 18:36:19 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-04 18:36:19 (GMT) |
| commit | f0bb9bc5b0f4c20536d6c77624bd148389b78c06 (patch) | |
| tree | 9088a173de4bfbeea29bc9464d4cb46257df67cd /examples/script/helloscript/main.cpp | |
| parent | 60be72310c0f9469b3201b250b257473184ccf2a (diff) | |
| parent | 1bb5999cdca0a70df3f96d596c83c3cf7c97c5fd (diff) | |
| download | Qt-f0bb9bc5b0f4c20536d6c77624bd148389b78c06.zip Qt-f0bb9bc5b0f4c20536d6c77624bd148389b78c06.tar.gz Qt-f0bb9bc5b0f4c20536d6c77624bd148389b78c06.tar.bz2 | |
Merge commit 'origin/4.6' 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); |