9 files changed, 44 insertions, 11 deletions
diff --git a/src/script/qscriptbuffer_p.h b/src/script/qscriptbuffer_p.h
index 9db32a869..4b829ee24 100644
--- a/src/script/qscriptbuffer_p.h
+++ b/src/script/qscriptbuffer_p.h
@@ -44,6 +44,11 @@
 
 #include <QtCore/qglobal.h>
 
+#if defined(Q_OS_VXWORKS) && defined(m_data)
+#  undef m_data
+#endif
+
+
 QT_BEGIN_NAMESPACE
 
 //
diff --git a/src/script/qscriptclassinfo_p.h b/src/script/qscriptclassinfo_p.h
index fb40d15ea..8f4d4fee8 100644
--- a/src/script/qscriptclassinfo_p.h
+++ b/src/script/qscriptclassinfo_p.h
@@ -53,6 +53,10 @@
 // We mean it.
 //
 
+#if defined(Q_OS_VXWORKS) && defined(m_type)
+#  undef m_type
+#endif
+
 #include "qscriptclassdata_p.h"
 
 #ifndef QT_NO_SCRIPT
diff --git a/src/script/qscriptecmadate.cpp b/src/script/qscriptecmadate.cpp
index 9b5372429..8c91a2537 100644
--- a/src/script/qscriptecmadate.cpp
+++ b/src/script/qscriptecmadate.cpp
@@ -58,10 +58,14 @@
 #include <math.h>
 
 #ifndef Q_WS_WIN
-#   include <time.h>
-#   include <sys/time.h>
+#  include <time.h>
+#  ifndef Q_OS_VXWORKS
+#    include <sys/time.h>
+#  else
+#    include "qplatformdefs.h"
+#  endif
 #else
-#   include <windows.h>
+#  include <windows.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp
index de78403d1..911d71483 100644
--- a/src/script/qscriptengine.cpp
+++ b/src/script/qscriptengine.cpp
@@ -935,7 +935,7 @@ QScriptSyntaxCheckResult QScriptEngine::checkSyntax(const QString &program)
   the file name is accessible through the "fileName" property if it's
   provided with this function.
 
-  \sa canEvaluate(), hasUncaughtException(), isEvaluating(), abortEvaluation()
+  \sa checkSyntax(), hasUncaughtException(), isEvaluating(), abortEvaluation()
 */
 QScriptValue QScriptEngine::evaluate(const QString &program, const QString &fileName, int lineNumber)
 {
diff --git a/src/script/qscriptgc_p.h b/src/script/qscriptgc_p.h
index 313519ab4..769e136b9 100644
--- a/src/script/qscriptgc_p.h
+++ b/src/script/qscriptgc_p.h
@@ -53,6 +53,10 @@
 // We mean it.
 //
 
+#if defined(Q_OS_VXWORKS) && defined(m_free)
+#  undef m_free
+#endif
+
 #include <QtCore/qglobal.h>
 
 #ifndef QT_NO_SCRIPT
diff --git a/src/script/qscriptmemberfwd_p.h b/src/script/qscriptmemberfwd_p.h
index 056876b9a..6c12feff1 100644
--- a/src/script/qscriptmemberfwd_p.h
+++ b/src/script/qscriptmemberfwd_p.h
@@ -53,6 +53,10 @@
 // We mean it.
 //
 
+#if defined(Q_OS_VXWORKS) && defined(m_flags)
+#  undef m_flags
+#endif
+
 #include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/script/qscriptsyntaxcheckresult_p.h b/src/script/qscriptsyntaxcheckresult_p.h
index d6049f8fc..9b51f7dee 100644
--- a/src/script/qscriptsyntaxcheckresult_p.h
+++ b/src/script/qscriptsyntaxcheckresult_p.h
@@ -53,6 +53,10 @@
 // We mean it.
 //
 
+#if defined(Q_OS_VXWORKS) && defined(m_type)
+#  undef m_type
+#endif
+
 #ifndef QT_NO_SCRIPT
 
 #include <QtCore/qatomic.h>
diff --git a/src/script/qscriptvalue.cpp b/src/script/qscriptvalue.cpp
index 97ce61abe..520e76f1f 100644
--- a/src/script/qscriptvalue.cpp
+++ b/src/script/qscriptvalue.cpp
@@ -574,9 +574,11 @@ void QScriptValue::setPrototype(const QScriptValue &prototype)
 }
 
 /*!
-  Returns the scope object of this QScriptValue. This function is only
-  relevant for function objects. The scope determines how variables are
-  resolved when the function is invoked.
+    \since 4.6
+
+    Returns the scope object of this QScriptValue. This function is only
+    relevant for function objects. The scope determines how variables are
+    resolved when the function is invoked.
 */
 QScriptValue QScriptValue::scope() const
 {
@@ -588,9 +590,11 @@ QScriptValue QScriptValue::scope() const
 }
 
 /*!
-  Sets the \a scope object of this QScriptValue. This function is only
-  relevant for function objects. Changing the scope is useful when creating
-  closures; see \l{Nested Functions and the Scope Chain}.
+    \since 4.6
+
+    Sets the \a scope object of this QScriptValue. This function is only
+    relevant for function objects. Changing the scope is useful when creating
+    closures; see \l{Nested Functions and the Scope Chain}.
 */
 void QScriptValue::setScope(const QScriptValue &scope)
 {
@@ -1438,7 +1442,7 @@ bool QScriptValue::isUndefined() const
   Note that function values, variant values, and QObject values are
   objects, so this function returns true for such values.
 
-  \sa toObject(), QScriptEngine::newObject()
+  \sa QScriptEngine::toObject(), QScriptEngine::newObject()
 */
 bool QScriptValue::isObject() const
 {
diff --git a/src/script/qscriptvalueimplfwd_p.h b/src/script/qscriptvalueimplfwd_p.h
index c30b32a9f..0953713c3 100644
--- a/src/script/qscriptvalueimplfwd_p.h
+++ b/src/script/qscriptvalueimplfwd_p.h
@@ -64,6 +64,10 @@ QT_BEGIN_NAMESPACE
 // We mean it.
 //
 
+#if defined(Q_OS_VXWORKS) && defined(m_type)
+#  undef m_type
+#endif
+
 class QScriptValueImpl;
 typedef QList<QScriptValueImpl> QScriptValueImplList;