diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-03 08:39:08 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-03 08:39:08 (GMT) |
| commit | e1ef51cdddf4187ab68d09f42438e45a6bbf85f4 (patch) | |
| tree | e1a59bdb9e3695f43064b6fa7f6ab33d5ef359ca /examples/script/helloscript/main.cpp | |
| parent | b495786061febf5e4c6baddbd6443f44f142c627 (diff) | |
| parent | 82a63405863f527028302ceaeff957f9ee5176e2 (diff) | |
| download | Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.zip Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.tar.gz Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.tar.bz2 | |
Merge remote branch 'mainline/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); |