diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2010-09-01 05:00:54 (GMT) |
---|---|---|
committer | Lorn Potter <lorn.potter@nokia.com> | 2010-09-01 05:00:54 (GMT) |
commit | 036d7afd42ce3ca9736e173a72bc5228a1eb211d (patch) | |
tree | bbeefb4384b393e860350a8a6142fa7d27141644 /src/script/api/qscriptprogram.cpp | |
parent | 87bc302810b97bd647187e5e31f5276ae729dce0 (diff) | |
parent | 31e4efaf2178b81552e875eb5a1d5a894310e561 (diff) | |
download | Qt-036d7afd42ce3ca9736e173a72bc5228a1eb211d.zip Qt-036d7afd42ce3ca9736e173a72bc5228a1eb211d.tar.gz Qt-036d7afd42ce3ca9736e173a72bc5228a1eb211d.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/script/api/qscriptprogram.cpp')
-rw-r--r-- | src/script/api/qscriptprogram.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/script/api/qscriptprogram.cpp b/src/script/api/qscriptprogram.cpp index 02beba4..3857b75 100644 --- a/src/script/api/qscriptprogram.cpp +++ b/src/script/api/qscriptprogram.cpp @@ -32,9 +32,7 @@ QT_BEGIN_NAMESPACE /*! - \internal - - \since 4.6 + \since 4.7 \class QScriptProgram \brief The QScriptProgram class encapsulates a Qt Script program. |