diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 02:09:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 02:09:11 (GMT) |
| commit | 7b6028276cf5de1ffd5ab8d6dede7cca12e906fd (patch) | |
| tree | 01e0f40bd9fe38beb99da89779b503302634328c /src/script/api | |
| parent | 882992494e0c6f6510e95976abdac5d57966eb6c (diff) | |
| parent | 31e4efaf2178b81552e875eb5a1d5a894310e561 (diff) | |
| download | Qt-7b6028276cf5de1ffd5ab8d6dede7cca12e906fd.zip Qt-7b6028276cf5de1ffd5ab8d6dede7cca12e906fd.tar.gz Qt-7b6028276cf5de1ffd5ab8d6dede7cca12e906fd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove unused source files in designer
make various POST_LINK steps nicer
fix qt_webkit_version.pri install for in-Qt builds
fix windows build with -prefix
Update to the NTLM code.
QTextEngine::LayoutData::reallocate musn't corrupt memory
Updated Twitter demo in response to the new Twitter oauth requirement
doc: Remove \internal tag from QScriptProgram
Doc: Reviewed updates to the model/view tutorial.
QNetworkAccessManager doc: add since tag for added enum
fixed compilation problem
added missing files
added missing files
problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables
moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
Diffstat (limited to 'src/script/api')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 3 | ||||
| -rw-r--r-- | src/script/api/qscriptprogram.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 8347626..07aced4 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -2626,8 +2626,7 @@ QScriptValue QScriptEngine::evaluate(const QString &program, const QString &file } /*! - \internal - \since 4.6 + \since 4.7 Evaluates the given \a program and returns the result of the evaluation. 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. |