Merge branch 'dev' into androidwip/android

Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc

33 files changed, 67 insertions, 123 deletions

diff --git a/src/script/api/qscriptable.cpp b/src/script/api/qscriptable.cpp
index 6a47330..96bdbe9 100644
--- a/src/script/api/qscriptable.cpp
+++ b/src/script/api/qscriptable.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptable.h b/src/script/api/qscriptable.h
index 82fa250..4f4fdc2 100644
--- a/src/script/api/qscriptable.h
+++ b/src/script/api/qscriptable.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -29,8 +29,6 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtScript/qtscriptglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -65,6 +63,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSCRIPTABLE_H
diff --git a/src/script/api/qscriptable_p.h b/src/script/api/qscriptable_p.h
index fa721b7..c7fcf3b 100644
--- a/src/script/api/qscriptable_p.h
+++ b/src/script/api/qscriptable_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptclass.cpp b/src/script/api/qscriptclass.cpp
index 3ff437a..8e286c8 100644
--- a/src/script/api/qscriptclass.cpp
+++ b/src/script/api/qscriptclass.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -179,7 +179,7 @@ QScriptEngine *QScriptClass::engine() const
   your class, then return it in this function.
 
   See the "Making Use of Prototype-Based Inheritance" section in the
-  QtScript documentation for more information on how prototypes are
+  Qt Script documentation for more information on how prototypes are
   used.
 */
 QScriptValue QScriptClass::prototype() const
diff --git a/src/script/api/qscriptclass.h b/src/script/api/qscriptclass.h
index d7d2011..fbc7699 100644
--- a/src/script/api/qscriptclass.h
+++ b/src/script/api/qscriptclass.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -30,8 +30,6 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtScript/qscriptvalue.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -94,6 +92,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptClass::QueryFlags)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/script/api/qscriptclasspropertyiterator.cpp b/src/script/api/qscriptclasspropertyiterator.cpp
index ec1e9bc..34c6d45 100644
--- a/src/script/api/qscriptclasspropertyiterator.cpp
+++ b/src/script/api/qscriptclasspropertyiterator.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptclasspropertyiterator.h b/src/script/api/qscriptclasspropertyiterator.h
index 96a49ef..3a946bd 100644
--- a/src/script/api/qscriptclasspropertyiterator.h
+++ b/src/script/api/qscriptclasspropertyiterator.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -29,8 +29,6 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtScript/qscriptvalue.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -69,6 +67,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp
index e23beae..cbded31 100644
--- a/src/script/api/qscriptcontext.cpp
+++ b/src/script/api/qscriptcontext.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -179,7 +179,7 @@ QScriptValue QScriptContext::throwValue(const QScriptValue &value)
   The error object will be initialized to contain information about
   the location where the error occurred; specifically, it will have
   properties \c{lineNumber}, \c{fileName} and \c{stack}. These
-  properties are described in \l {QtScript Extensions to ECMAScript}.
+  properties are described in \l {Qt Script Extensions to ECMAScript}.
 
   \sa throwValue(), state()
 */
diff --git a/src/script/api/qscriptcontext.h b/src/script/api/qscriptcontext.h
index 81b23a2..8cbfad8 100644
--- a/src/script/api/qscriptcontext.h
+++ b/src/script/api/qscriptcontext.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -28,8 +28,6 @@
 
 #include <QtScript/qscriptvalue.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -98,6 +96,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/script/api/qscriptcontext_p.h b/src/script/api/qscriptcontext_p.h
index 6a57e5b..d57db7f 100644
--- a/src/script/api/qscriptcontext_p.h
+++ b/src/script/api/qscriptcontext_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp
index afe38b6..15f0966 100644
--- a/src/script/api/qscriptcontextinfo.cpp
+++ b/src/script/api/qscriptcontextinfo.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -159,7 +159,7 @@ QScriptContextInfoPrivate::QScriptContextInfoPrivate(const QScriptContext *conte
             if (returnPC && codeBlock && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) {
 #if ENABLE(JIT)
                 JSC::JITCode code = codeBlock->getJITCode();
-                unsigned jitOffset = code.offsetOf(JSC::ReturnAddressPtr(returnPC).value());
+                uintptr_t jitOffset = reinterpret_cast<uintptr_t>(JSC::ReturnAddressPtr(returnPC).value()) - reinterpret_cast<uintptr_t>(code.addressForCall().executableAddress());
                 // We can only use the JIT code offset if it's smaller than the JIT size;
                 // otherwise calling getBytecodeIndex() is meaningless.
                 if (jitOffset < code.size()) {
diff --git a/src/script/api/qscriptcontextinfo.h b/src/script/api/qscriptcontextinfo.h
index 28baf70..d8000ca 100644
--- a/src/script/api/qscriptcontextinfo.h
+++ b/src/script/api/qscriptcontextinfo.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -31,8 +31,6 @@
 #include <QtCore/qsharedpointer.h>
 #include <QtScript/qtscriptglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -101,6 +99,4 @@ Q_SCRIPT_EXPORT QDataStream &operator>>(QDataStream &, QScriptContextInfo &);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 0a327b5..cefcd50 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -98,7 +98,7 @@ QT_BEGIN_NAMESPACE
   \ingroup script
   \mainclass
 
-  See the \l{QtScript} documentation for information about the Qt Script language,
+  See the \l{Qt Script} documentation for information about the Qt Script language,
   and how to get started with scripting your C++ application.
 
   \section1 Evaluating Scripts
@@ -1262,7 +1262,7 @@ void QScriptEnginePrivate::setContextFlags(JSC::ExecState *exec, uint flags)
 
 // This function is called by JSC after all objects reachable by JSC itself
 // have been processed (see JSC::Heap::markRoots()).
-// Here we should mark additional objects managed by QtScript.
+// Here we should mark additional objects managed by Qt Script.
 void QScriptEnginePrivate::mark(JSC::MarkStack& markStack)
 {
     Q_Q(QScriptEngine);
@@ -2183,7 +2183,7 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun,
 #ifndef QT_NO_REGEXP
 
 /*!
-  Creates a QtScript object of class RegExp with the given
+  Creates a Qt Script object of class RegExp with the given
   \a regexp.
 
   \sa QScriptValue::toRegExp()
@@ -2198,7 +2198,7 @@ QScriptValue QScriptEngine::newRegExp(const QRegExp &regexp)
 #endif // QT_NO_REGEXP
 
 /*!
-  Creates a QtScript object holding the given variant \a value.
+  Creates a Qt Script object holding the given variant \a value.
 
   If a default prototype has been registered with the meta type id of
   \a value, then the prototype of the created object will be that
@@ -2251,13 +2251,13 @@ QScriptValue QScriptEngine::newVariant(const QScriptValue &object,
 
 #ifndef QT_NO_QOBJECT
 /*!
-  Creates a QtScript object that wraps the given QObject \a
+  Creates a Qt Script object that wraps the given QObject \a
   object, using the given \a ownership. The given \a options control
   various aspects of the interaction with the resulting script object.
 
   Signals and slots, properties and children of \a object are
   available as properties of the created QScriptValue. For more
-  information, see the \l{QtScript} documentation.
+  information, see the \l{Qt Script} documentation.
 
   If \a object is a null pointer, this function returns nullValue().
 
@@ -2265,8 +2265,8 @@ QScriptValue QScriptEngine::newVariant(const QScriptValue &object,
   (or its superclass, recursively), the prototype of the new script
   object will be set to be that default prototype.
 
-  If the given \a object is deleted outside of QtScript's control, any
-  attempt to access the deleted QObject's members through the QtScript
+  If the given \a object is deleted outside of Qt Script's control, any
+  attempt to access the deleted QObject's members through the Qt Script
   wrapper object (either by script code or C++) will result in a
   script exception.
 
@@ -2337,7 +2337,7 @@ QScriptValue QScriptEngine::newQObject(const QScriptValue &scriptObject,
 #endif // QT_NO_QOBJECT
 
 /*!
-  Creates a QtScript object of class Object.
+  Creates a Qt Script object of class Object.
 
   The prototype of the created object will be the Object
   prototype object.
@@ -2355,7 +2355,7 @@ QScriptValue QScriptEngine::newObject()
   \since 4.4
   \overload
 
-  Creates a QtScript Object of the given class, \a scriptClass.
+  Creates a Qt Script Object of the given class, \a scriptClass.
 
   The prototype of the created object will be the Object
   prototype object.
@@ -2467,7 +2467,7 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionWithArgSignature
 }
 
 /*!
-  Creates a QtScript object of class Array with the given \a length.
+  Creates a Qt Script object of class Array with the given \a length.
 
   \sa newObject()
 */
@@ -2479,7 +2479,7 @@ QScriptValue QScriptEngine::newArray(uint length)
 }
 
 /*!
-  Creates a QtScript object of class RegExp with the given
+  Creates a Qt Script object of class RegExp with the given
   \a pattern and \a flags.
 
   The legal flags are 'g' (global), 'i' (ignore case), and 'm'
@@ -2493,7 +2493,7 @@ QScriptValue QScriptEngine::newRegExp(const QString &pattern, const QString &fla
 }
 
 /*!
-  Creates a QtScript object of class Date with the given
+  Creates a Qt Script object of class Date with the given
   \a value (the number of milliseconds since 01 January 1970,
   UTC).
 */
@@ -2505,7 +2505,7 @@ QScriptValue QScriptEngine::newDate(qsreal value)
 }
 
 /*!
-  Creates a QtScript object of class Date from the given \a value.
+  Creates a Qt Script object of class Date from the given \a value.
 
   \sa QScriptValue::toDateTime()
 */
@@ -2518,7 +2518,7 @@ QScriptValue QScriptEngine::newDate(const QDateTime &value)
 
 #ifndef QT_NO_QOBJECT
 /*!
-  Creates a QtScript object that represents a QObject class, using the
+  Creates a Qt Script object that represents a QObject class, using the
   the given \a metaObject and constructor \a ctor.
 
   Enums of \a metaObject (declared with Q_ENUMS) are available as
@@ -2591,7 +2591,7 @@ QScriptValue QScriptEngine::newQMetaObject(
   valid, and so on.
 
   A typical usage of canEvaluate() is to implement an interactive
-  interpreter for QtScript. The user is repeatedly queried for
+  interpreter for Qt Script. The user is repeatedly queried for
   individual lines of code; the lines are concatened internally, and
   only when canEvaluate() returns true for the resulting program is it
   passed to evaluate().
@@ -2599,7 +2599,7 @@ QScriptValue QScriptEngine::newQMetaObject(
   The following are some examples to illustrate the behavior of
   canEvaluate(). (Note that all example inputs are assumed to have an
   explicit newline as their last character, since otherwise the
-  QtScript parser would automatically insert a semi-colon character at
+  Qt Script parser would automatically insert a semi-colon character at
   the end of the input, and this could cause canEvaluate() to produce
   different results.)
 
@@ -2620,7 +2620,7 @@ QScriptValue QScriptEngine::newQMetaObject(
   Given the input
   \snippet code/src_script_qscriptengine.cpp 17
   canEvaluate() will return true, even though the code is clearly not
-  syntactically valid QtScript code. evaluate() will throw a
+  syntactically valid Qt Script code. evaluate() will throw a
   SyntaxError when this code is evaluated.
 
   Given the input
@@ -3607,7 +3607,7 @@ void QScriptEngine::installTranslatorFunctions(const QScriptValue &object)
     once; subsequent calls to importExtension() with the same extension
     name will do nothing and return undefinedValue().
 
-    \sa availableExtensions(), QScriptExtensionPlugin, {Creating QtScript Extensions}
+    \sa availableExtensions(), QScriptExtensionPlugin, {Creating Qt Script Extensions}
 */
 QScriptValue QScriptEngine::importExtension(const QString &extension)
 {
@@ -3876,10 +3876,10 @@ QStringList QScriptEngine::importedExtensions() const
 
     Note that the template type \c{T} must be known to QMetaType.
 
-    See \l{Conversion Between QtScript and C++ Types} for a
+    See \l{Conversion Between Qt Script and C++ Types} for a
     description of the built-in type conversion provided by
-    QtScript. By default, the types that are not specially handled by
-    QtScript are represented as QVariants (e.g. the \a value is passed
+    Qt Script. By default, the types that are not specially handled by
+    Qt Script are represented as QVariants (e.g. the \a value is passed
     to newVariant()); you can change this behavior by installing your
     own type conversion functions with qScriptRegisterMetaType().
 
@@ -3892,9 +3892,9 @@ QStringList QScriptEngine::importedExtensions() const
 
     Note that \c{T} must be known to QMetaType.
 
-    See \l{Conversion Between QtScript and C++ Types} for a
+    See \l{Conversion Between Qt Script and C++ Types} for a
     description of the built-in type conversion provided by
-    QtScript.
+    Qt Script.
 
     \sa toScriptValue(), qScriptRegisterMetaType()
 */
@@ -3947,7 +3947,7 @@ QStringList QScriptEngine::importedExtensions() const
 
     Additionally, the type of each element in the sequence should be
     suitable for conversion to a QScriptValue.  See
-    \l{Conversion Between QtScript and C++ Types} for more information
+    \l{Conversion Between Qt Script and C++ Types} for more information
     about the restrictions on types that can be used with QScriptValue.
 
     \sa QScriptEngine::fromScriptValue()
@@ -3967,7 +3967,7 @@ QStringList QScriptEngine::importedExtensions() const
 
     Additionally, the type of each element in the sequence must be
     suitable for conversion to a C++ type from a QScriptValue.  See
-    \l{Conversion Between QtScript and C++ Types} for more information
+    \l{Conversion Between Qt Script and C++ Types} for more information
     about the restrictions on types that can be used with
     QScriptValue.
 
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h
index 951053f..fcfb4a2 100644
--- a/src/script/api/qscriptengine.h
+++ b/src/script/api/qscriptengine.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -40,8 +40,6 @@
 #include <QtScript/qscriptstring.h>
 #include <QtScript/qscriptprogram.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -445,6 +443,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptEngine::QObjectWrapOptions)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSCRIPTENGINE_H
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index 1c591b8..daad0a5 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp
index 86dc89a..176773d 100644
--- a/src/script/api/qscriptengineagent.cpp
+++ b/src/script/api/qscriptengineagent.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptengineagent.h b/src/script/api/qscriptengineagent.h
index 14e551f..289ce52 100644
--- a/src/script/api/qscriptengineagent.h
+++ b/src/script/api/qscriptengineagent.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -30,8 +30,6 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtScript/qtscriptglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -86,6 +84,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/script/api/qscriptengineagent_p.h b/src/script/api/qscriptengineagent_p.h
index bfc6515..8072bd1 100644
--- a/src/script/api/qscriptengineagent_p.h
+++ b/src/script/api/qscriptengineagent_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptextensioninterface.h b/src/script/api/qscriptextensioninterface.h
index 39fd5e1..ea9af81 100644
--- a/src/script/api/qscriptextensioninterface.h
+++ b/src/script/api/qscriptextensioninterface.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -29,8 +29,6 @@
 #include <QtCore/qobject.h>
 #include <QtScript/qtscriptglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -48,6 +46,4 @@ Q_DECLARE_INTERFACE(QScriptExtensionInterface, QScriptExtensionInterface_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSCRIPTEXTENSIONINTERFACE_H
diff --git a/src/script/api/qscriptextensionplugin.cpp b/src/script/api/qscriptextensionplugin.cpp
index 4926ca5..a3e6fe7 100644
--- a/src/script/api/qscriptextensionplugin.cpp
+++ b/src/script/api/qscriptextensionplugin.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -41,10 +41,10 @@ QT_BEGIN_NAMESPACE
 
     Writing a script extension plugin is achieved by subclassing this
     base class, reimplementing the pure virtual keys() and initialize()
-    functions, and exporting the class using the Q_EXPORT_PLUGIN2()
+    functions, and exporting the class using the Q_PLUGIN_METADATA()
     macro. See \l {How to Create Qt Plugins} for details.
 
-    \sa QScriptEngine::importExtension(), {Creating QtScript Extensions}
+    \sa QScriptEngine::importExtension(), {Creating Qt Script Extensions}
 */
 
 /*!
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
     Constructs a script extension plugin with the given \a parent.
 
     Note that this constructor is invoked automatically by the
-    Q_EXPORT_PLUGIN2() macro, so there is no need for calling it
+    Q_PLUGIN_METADATA() macro, so there is no need for calling it
     explicitly.
 */
 QScriptExtensionPlugin::QScriptExtensionPlugin(QObject *parent)
diff --git a/src/script/api/qscriptextensionplugin.h b/src/script/api/qscriptextensionplugin.h
index e59c398..5fad2e4 100644
--- a/src/script/api/qscriptextensionplugin.h
+++ b/src/script/api/qscriptextensionplugin.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -28,8 +28,6 @@
 
 #include <QtScript/qscriptextensioninterface.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -52,6 +50,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSCRIPTEXTENSIONPLUGIN_H
diff --git a/src/script/api/qscriptprogram.cpp b/src/script/api/qscriptprogram.cpp
index f588b7d..a66f198 100644
--- a/src/script/api/qscriptprogram.cpp
+++ b/src/script/api/qscriptprogram.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptprogram.h b/src/script/api/qscriptprogram.h
index 18a303c..0d3d413 100644
--- a/src/script/api/qscriptprogram.h
+++ b/src/script/api/qscriptprogram.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -29,8 +29,6 @@
 #include <QtCore/qstring.h>
 #include <QtScript/qtscriptglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -63,6 +61,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSCRIPTPROGRAM_H
diff --git a/src/script/api/qscriptprogram_p.h b/src/script/api/qscriptprogram_p.h
index 4b10e84..2c05be0 100644
--- a/src/script/api/qscriptprogram_p.h
+++ b/src/script/api/qscriptprogram_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp
index fc23ab1..34767ac 100644
--- a/src/script/api/qscriptstring.cpp
+++ b/src/script/api/qscriptstring.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -156,7 +156,7 @@ bool QScriptString::operator!=(const QScriptString &other) const
 /*!
   \since 4.6
 
-  Attempts to convert this QScriptString to a QtScript array index,
+  Attempts to convert this QScriptString to a Qt Script array index,
   and returns the result.
 
   If a conversion error occurs, *\a{ok} is set to false; otherwise
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h
index 42a8d2f..f763de2 100644
--- a/src/script/api/qscriptstring.h
+++ b/src/script/api/qscriptstring.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -29,8 +29,6 @@
 #include <QtCore/qsharedpointer.h>
 #include <QtScript/qtscriptglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -64,6 +62,4 @@ Q_SCRIPT_EXPORT uint qHash(const QScriptString &key);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSCRIPTSTRING_H
diff --git a/src/script/api/qscriptstring_p.h b/src/script/api/qscriptstring_p.h
index a119a3e..575e8cc 100644
--- a/src/script/api/qscriptstring_p.h
+++ b/src/script/api/qscriptstring_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index c86a6b2..3e307a2 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -94,7 +94,7 @@
   not have the requested property. Note that this prototype-based
   lookup is not performed by setProperty(); setProperty() will always
   create the property in the script object itself.  For more
-  information, see the \l{QtScript} documentation.
+  information, see the \l{Qt Script} documentation.
 
   Function objects (objects for which isFunction() returns true) can
   be invoked by calling call(). Constructor functions can be used to
@@ -2014,7 +2014,7 @@ bool QScriptValue::isValid() const
 /*!
   \since 4.4
 
-  Returns the internal data of this QScriptValue object. QtScript uses
+  Returns the internal data of this QScriptValue object. Qt Script uses
   this property to store the primitive value of Date, String, Number
   and Boolean objects. For other types of object, custom data may be
   stored using setData().
diff --git a/src/script/api/qscriptvalue.h b/src/script/api/qscriptvalue.h
index 670f928..9ea69c1 100644
--- a/src/script/api/qscriptvalue.h
+++ b/src/script/api/qscriptvalue.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -30,8 +30,6 @@
 #include <QtCore/qsharedpointer.h>
 #include <QtScript/qtscriptglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -218,6 +216,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptValue::PropertyFlags)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/script/api/qscriptvalue_p.h b/src/script/api/qscriptvalue_p.h
index 79d3498..94159b2 100644
--- a/src/script/api/qscriptvalue_p.h
+++ b/src/script/api/qscriptvalue_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp
index c206f5a..a1cd8ba 100644
--- a/src/script/api/qscriptvalueiterator.cpp
+++ b/src/script/api/qscriptvalueiterator.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
diff --git a/src/script/api/qscriptvalueiterator.h b/src/script/api/qscriptvalueiterator.h
index 84bf30a..19019b5 100644
--- a/src/script/api/qscriptvalueiterator.h
+++ b/src/script/api/qscriptvalueiterator.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtScript module of the Qt Toolkit.
@@ -28,8 +28,6 @@
 
 #include <QtCore/qscopedpointer.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -73,6 +71,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSCRIPTVALUEITERATOR_H
diff --git a/src/script/api/qtscriptglobal.h b/src/script/api/qtscriptglobal.h
index 4bc3b31..1b74cf6 100644
--- a/src/script/api/qtscriptglobal.h
+++ b/src/script/api/qtscriptglobal.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
@@ -66,6 +64,4 @@ QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif