diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-12-01 07:42:46 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-12-01 07:42:46 (GMT) |
| commit | d8548a8e4696512c5e7796b866ed98a7bd52f673 (patch) | |
| tree | cd70d093e4ee24ab27b9fecfa8ad77449d1794c9 /examples/script/helloscript/main.cpp | |
| parent | 182efb3d2c5182a89d7416f474811309d7939786 (diff) | |
| parent | 700a069591d29733609e619c224861ca774bfb32 (diff) | |
| download | Qt-d8548a8e4696512c5e7796b866ed98a7bd52f673.zip Qt-d8548a8e4696512c5e7796b866ed98a7bd52f673.tar.gz Qt-d8548a8e4696512c5e7796b866ed98a7bd52f673.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 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); |