summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorminiak <milan.burda@gmail.com>2010-08-03 16:33:09 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-08-03 16:35:27 (GMT)
commitb9328bd135a3556cef2438fa049fb9e1d7cbb977 (patch)
treea4045d69357334c8d484bd2fd648f03d80e5ccfb /src/script
parent8435ba93fad9eb799764eb3b66a8a9838db3fea3 (diff)
downloadQt-b9328bd135a3556cef2438fa049fb9e1d7cbb977.zip
Qt-b9328bd135a3556cef2438fa049fb9e1d7cbb977.tar.gz
Qt-b9328bd135a3556cef2438fa049fb9e1d7cbb977.tar.bz2
Fix MS Visual C++ 6.0 references in the documentation
Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/script')
-rw-r--r--src/script/api/qscriptengine.cpp32
1 files changed, 13 insertions, 19 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 30c197e..01f3c51 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -2435,10 +2435,6 @@ QScriptValue QScriptEngine::newQMetaObject(
\snippet doc/src/snippets/code/src_script_qscriptengine.cpp 13
- \warning This function is not available with MSVC 6. Use
- qScriptValueFromQMetaObject() instead if you need to support that version
- of the compiler.
-
\sa QScriptEngine::newQMetaObject()
*/
@@ -2451,9 +2447,11 @@ QScriptValue QScriptEngine::newQMetaObject(
\c{T}.
This function is equivalent to
- QScriptEngine::scriptValueFromQMetaObject(). It is provided as a
- work-around for MSVC 6, which doesn't support member template
- functions.
+ QScriptEngine::scriptValueFromQMetaObject().
+
+ \note This function was provided as a workaround for MSVC 6
+ which did not support member template functions. It is advised
+ to use the other form in new code.
\sa QScriptEngine::newQMetaObject()
*/
@@ -3744,10 +3742,6 @@ QStringList QScriptEngine::importedExtensions() const
to newVariant()); you can change this behavior by installing your
own type conversion functions with qScriptRegisterMetaType().
- \warning This function is not available with MSVC 6. Use
- qScriptValueFromValue() instead if you need to support that
- version of the compiler.
-
\sa fromScriptValue(), qScriptRegisterMetaType()
*/
@@ -3761,10 +3755,6 @@ QStringList QScriptEngine::importedExtensions() const
description of the built-in type conversion provided by
QtScript.
- \warning This function is not available with MSVC 6. Use
- qScriptValueToValue() or qscriptvalue_cast() instead if you need
- to support that version of the compiler.
-
\sa toScriptValue(), qScriptRegisterMetaType()
*/
@@ -3777,8 +3767,10 @@ QStringList QScriptEngine::importedExtensions() const
value of template type \c{T}.
This function is equivalent to QScriptEngine::toScriptValue().
- It is provided as a work-around for MSVC 6, which doesn't support
- member template functions.
+
+ \note This function was provided as a workaround for MSVC 6
+ which did not support member template functions. It is advised
+ to use the other form in new code.
\sa qScriptValueToValue()
*/
@@ -3791,8 +3783,10 @@ QStringList QScriptEngine::importedExtensions() const
Returns the given \a value converted to the template type \c{T}.
This function is equivalent to QScriptEngine::fromScriptValue().
- It is provided as a work-around for MSVC 6, which doesn't
- support member template functions.
+
+ \note This function was provided as a workaround for MSVC 6
+ which did not support member template functions. It is advised
+ to use the other form in new code.
\sa qScriptValueFromValue()
*/