diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-18 10:39:16 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-18 10:39:16 (GMT) |
| commit | 0b96a20f201dbd91599ee890f42dd8e452d15f79 (patch) | |
| tree | fbefbfe77e669f7d58a39c2be612a7098e6f7e17 /doc/src/examples/qtscriptcalculator.qdoc | |
| parent | 379073630202d37cf8e3927dc9745134ac2f5512 (diff) | |
| parent | 7a64a3f67d53a99e6e2200f6481c98013004b4e4 (diff) | |
| download | Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.zip Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.gz Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/script/qscriptclass.cpp
src/script/qscriptcontext.cpp
src/script/qscriptengine.cpp
src/script/qscriptvalue.cpp
Diffstat (limited to 'doc/src/examples/qtscriptcalculator.qdoc')
| -rw-r--r-- | doc/src/examples/qtscriptcalculator.qdoc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/src/examples/qtscriptcalculator.qdoc b/doc/src/examples/qtscriptcalculator.qdoc index 21aad23..7adce5a 100644 --- a/doc/src/examples/qtscriptcalculator.qdoc +++ b/doc/src/examples/qtscriptcalculator.qdoc @@ -42,7 +42,6 @@ /*! \example script/calculator \title QtScript Calculator Example - \ingroup scripting In this simple QtScript example, we show how to implement the functionality of a calculator widget. |