diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-02-08 16:27:41 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-02-08 16:31:20 +0100 |
| commit | 84f9848fd9f20536b18834a54ef15c6a65f8a682 (patch) | |
| tree | c31353dd1434692b2b4f351126b3abcd8460b8a8 /src/script | |
| parent | e7a8eef49d6d205e6cb549e879a27af4fe7fcce4 (diff) | |
| parent | 689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (diff) | |
| download | qtscript-84f9848fd9f20536b18834a54ef15c6a65f8a682.tar.gz | |
Merge branch 'dev' into androidwip/android
Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc
Diffstat (limited to 'src/script')
91 files changed, 197 insertions, 267 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 ®exp) #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 diff --git a/src/script/bridge/qscriptactivationobject.cpp b/src/script/bridge/qscriptactivationobject.cpp index e2e0cde..a504fac 100644 --- a/src/script/bridge/qscriptactivationobject.cpp +++ b/src/script/bridge/qscriptactivationobject.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/bridge/qscriptactivationobject_p.h b/src/script/bridge/qscriptactivationobject_p.h index 430560f..9148506 100644 --- a/src/script/bridge/qscriptactivationobject_p.h +++ b/src/script/bridge/qscriptactivationobject_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/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp index 3e97cb3..6503d68 100644 --- a/src/script/bridge/qscriptclassobject.cpp +++ b/src/script/bridge/qscriptclassobject.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/bridge/qscriptclassobject_p.h b/src/script/bridge/qscriptclassobject_p.h index e2b1cb8..33f286b 100644 --- a/src/script/bridge/qscriptclassobject_p.h +++ b/src/script/bridge/qscriptclassobject_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/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp index 95bb8cc..9889574 100644 --- a/src/script/bridge/qscriptdeclarativeclass.cpp +++ b/src/script/bridge/qscriptdeclarativeclass.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 QtDeclarative module of the Qt Toolkit. diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h index 54b7c5a..ec1e4b5 100644 --- a/src/script/bridge/qscriptdeclarativeclass_p.h +++ b/src/script/bridge/qscriptdeclarativeclass_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 QtDeclarative module of the Qt Toolkit. diff --git a/src/script/bridge/qscriptdeclarativeobject.cpp b/src/script/bridge/qscriptdeclarativeobject.cpp index 1f6b5e0..08dadb6 100644 --- a/src/script/bridge/qscriptdeclarativeobject.cpp +++ b/src/script/bridge/qscriptdeclarativeobject.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 QtDeclarative module of the Qt Toolkit. diff --git a/src/script/bridge/qscriptdeclarativeobject_p.h b/src/script/bridge/qscriptdeclarativeobject_p.h index 34575ba..f18b39e 100644 --- a/src/script/bridge/qscriptdeclarativeobject_p.h +++ b/src/script/bridge/qscriptdeclarativeobject_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 QtDeclarative module of the Qt Toolkit. diff --git a/src/script/bridge/qscriptfunction.cpp b/src/script/bridge/qscriptfunction.cpp index e75b1fd..cb65016 100644 --- a/src/script/bridge/qscriptfunction.cpp +++ b/src/script/bridge/qscriptfunction.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/bridge/qscriptfunction_p.h b/src/script/bridge/qscriptfunction_p.h index 3fd461a..9ef5d3d 100644 --- a/src/script/bridge/qscriptfunction_p.h +++ b/src/script/bridge/qscriptfunction_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/bridge/qscriptglobalobject.cpp b/src/script/bridge/qscriptglobalobject.cpp index 5ce99f8..f443bad 100644 --- a/src/script/bridge/qscriptglobalobject.cpp +++ b/src/script/bridge/qscriptglobalobject.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/bridge/qscriptglobalobject_p.h b/src/script/bridge/qscriptglobalobject_p.h index 1ea3886..6ab9226 100644 --- a/src/script/bridge/qscriptglobalobject_p.h +++ b/src/script/bridge/qscriptglobalobject_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/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp index 3c1cf97..4eeb880 100644 --- a/src/script/bridge/qscriptobject.cpp +++ b/src/script/bridge/qscriptobject.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/bridge/qscriptobject_p.h b/src/script/bridge/qscriptobject_p.h index d12105f..cfd9831 100644 --- a/src/script/bridge/qscriptobject_p.h +++ b/src/script/bridge/qscriptobject_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/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 75395fd..1df0264 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.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. @@ -2317,7 +2317,7 @@ int QObjectData::markConnections(JSC::MarkStack& markStack) // This function assumes all objects reachable elsewhere in the JS environment // (stack, heap) have been marked already (see QScriptEnginePrivate::mark()). -// This determines whether any of QtScript's internal QObject wrappers are only +// This determines whether any of Qt Script's internal QObject wrappers are only // weakly referenced and can be discarded. void QObjectData::markWrappers(JSC::MarkStack& markStack) { diff --git a/src/script/bridge/qscriptqobject_p.h b/src/script/bridge/qscriptqobject_p.h index 779ec22..da73ec9 100644 --- a/src/script/bridge/qscriptqobject_p.h +++ b/src/script/bridge/qscriptqobject_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/bridge/qscriptstaticscopeobject.cpp b/src/script/bridge/qscriptstaticscopeobject.cpp index 1ba4614..9c83d9b 100644 --- a/src/script/bridge/qscriptstaticscopeobject.cpp +++ b/src/script/bridge/qscriptstaticscopeobject.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/bridge/qscriptstaticscopeobject_p.h b/src/script/bridge/qscriptstaticscopeobject_p.h index 0c3e6f5..e950e79 100644 --- a/src/script/bridge/qscriptstaticscopeobject_p.h +++ b/src/script/bridge/qscriptstaticscopeobject_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/bridge/qscriptvariant.cpp b/src/script/bridge/qscriptvariant.cpp index 5d1ff78..f71174b 100644 --- a/src/script/bridge/qscriptvariant.cpp +++ b/src/script/bridge/qscriptvariant.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/bridge/qscriptvariant_p.h b/src/script/bridge/qscriptvariant_p.h index b0f374f..6c96430 100644 --- a/src/script/bridge/qscriptvariant_p.h +++ b/src/script/bridge/qscriptvariant_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/doc/qtscript.qdocconf b/src/script/doc/qtscript.qdocconf index d07e15a..7f8d37c 100644 --- a/src/script/doc/qtscript.qdocconf +++ b/src/script/doc/qtscript.qdocconf @@ -16,7 +16,7 @@ headerdirs += .. imagedirs += images sourcedirs += .. -depends += qtcore +depends += qtcore qtlinguist qtscripttools # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in @@ -32,15 +32,16 @@ qhp.qtscript.file = qtscript.qhp # Namespace for the output file. This namespace is used to distinguish between # different documentation files in Creator/Assistant. -qhp.qtscript.namespace = org.qt-project.qtscript.500 +qhp.qtscript.namespace = org.qt-project.qtscript.501 # Title for the package, will be the main title for the package in # Assistant/Creator. -qhp.qtscript.indexTitle = Qt Script Documentation +qhp.qtscript.indexTitle = Qt Script # Only update the name of the project for the next variables. qhp.qtscript.virtualFolder = qtscript qhp.qtscript.subprojects = classes -qhp.qtscript.subprojects.classes.title = Qt Script C++ Classes +qhp.qtscript.subprojects.classes.title = C++ Classes +qhp.qtscript.subprojects.classes.indexTitle = Qt Script C++ Classes qhp.qtscript.subprojects.classes.selectors = class fake:headerfile qhp.qtscript.subprojects.classes.sortPages = true diff --git a/src/script/doc/snippets/code/doc_src_qtscript.cpp b/src/script/doc/snippets/code/doc_src_qtscript.cpp index 3e4cb04..6cbb5de 100644 --- a/src/script/doc/snippets/code/doc_src_qtscript.cpp +++ b/src/script/doc/snippets/code/doc_src_qtscript.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 documentation of the Qt Toolkit. @@ -65,7 +65,7 @@ public: void aNonScriptableFunction(); -public slots: // these functions (slots) will be available in QtScript +public slots: // these functions (slots) will be available in Qt Script void calculate( ... ); void setEnabled( bool enabled ); bool isEnabled() const; @@ -103,7 +103,7 @@ public: void aNonScriptableFunction(); -public slots: // these functions (slots) will be available in QtScript +public slots: // these functions (slots) will be available in Qt Script void calculate( ... ); void setEnabled( bool enabled ); bool isEnabled() const; @@ -132,7 +132,7 @@ public: void aNonScriptableFunction(); -public slots: // these functions (slots) will be available in QtScript +public slots: // these functions (slots) will be available in Qt Script void calculate( ... ); void setEnabled( bool enabled ); bool isEnabled() const; diff --git a/src/script/doc/snippets/code/doc_src_qtscript.js b/src/script/doc/snippets/code/doc_src_qtscript.js index 98995f1..155cda1 100644 --- a/src/script/doc/snippets/code/doc_src_qtscript.js +++ b/src/script/doc/snippets/code/doc_src_qtscript.js @@ -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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/code/doc_src_qtscript.pro b/src/script/doc/snippets/code/doc_src_qtscript.pro index b68aa31..698ed00 100644 --- a/src/script/doc/snippets/code/doc_src_qtscript.pro +++ b/src/script/doc/snippets/code/doc_src_qtscript.pro @@ -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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/code/doc_src_qtscript.qdoc b/src/script/doc/snippets/code/doc_src_qtscript.qdoc index c66e553..5dcad87 100644 --- a/src/script/doc/snippets/code/doc_src_qtscript.qdoc +++ b/src/script/doc/snippets/code/doc_src_qtscript.qdoc @@ -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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/code/doc_src_qtscriptextensions.js b/src/script/doc/snippets/code/doc_src_qtscriptextensions.js index 915733f..fa36087 100644 --- a/src/script/doc/snippets/code/doc_src_qtscriptextensions.js +++ b/src/script/doc/snippets/code/doc_src_qtscriptextensions.js @@ -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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/code/src_script_qscriptable.cpp b/src/script/doc/snippets/code/src_script_qscriptable.cpp index 9f14b15..9c8d1ae 100644 --- a/src/script/doc/snippets/code/src_script_qscriptable.cpp +++ b/src/script/doc/snippets/code/src_script_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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/code/src_script_qscriptclass.cpp b/src/script/doc/snippets/code/src_script_qscriptclass.cpp index 32ac221..cd4b090 100644 --- a/src/script/doc/snippets/code/src_script_qscriptclass.cpp +++ b/src/script/doc/snippets/code/src_script_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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/code/src_script_qscriptcontext.cpp b/src/script/doc/snippets/code/src_script_qscriptcontext.cpp index 5365989..ba888a2 100644 --- a/src/script/doc/snippets/code/src_script_qscriptcontext.cpp +++ b/src/script/doc/snippets/code/src_script_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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/code/src_script_qscriptengine.cpp b/src/script/doc/snippets/code/src_script_qscriptengine.cpp index 8bc53e3..7128410 100644 --- a/src/script/doc/snippets/code/src_script_qscriptengine.cpp +++ b/src/script/doc/snippets/code/src_script_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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/code/src_script_qscriptengineagent.cpp b/src/script/doc/snippets/code/src_script_qscriptengineagent.cpp index 7e95b30..8c46c05 100644 --- a/src/script/doc/snippets/code/src_script_qscriptengineagent.cpp +++ b/src/script/doc/snippets/code/src_script_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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/code/src_script_qscriptvalue.cpp b/src/script/doc/snippets/code/src_script_qscriptvalue.cpp index 84d025b..2f780af 100644 --- a/src/script/doc/snippets/code/src_script_qscriptvalue.cpp +++ b/src/script/doc/snippets/code/src_script_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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/code/src_script_qscriptvalueiterator.cpp b/src/script/doc/snippets/code/src_script_qscriptvalueiterator.cpp index a00637a..7333d01 100644 --- a/src/script/doc/snippets/code/src_script_qscriptvalueiterator.cpp +++ b/src/script/doc/snippets/code/src_script_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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/qtscript/evaluation/main.cpp b/src/script/doc/snippets/qtscript/evaluation/main.cpp index e82756d..7001a37 100644 --- a/src/script/doc/snippets/qtscript/evaluation/main.cpp +++ b/src/script/doc/snippets/qtscript/evaluation/main.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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/qtscript/registeringobjects/main.cpp b/src/script/doc/snippets/qtscript/registeringobjects/main.cpp index 3b089bd..0176251 100644 --- a/src/script/doc/snippets/qtscript/registeringobjects/main.cpp +++ b/src/script/doc/snippets/qtscript/registeringobjects/main.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 documentation of the Qt Toolkit. diff --git a/src/script/doc/snippets/qtscript/registeringvalues/main.cpp b/src/script/doc/snippets/qtscript/registeringvalues/main.cpp index 6549f1a..c5d0af8 100644 --- a/src/script/doc/snippets/qtscript/registeringvalues/main.cpp +++ b/src/script/doc/snippets/qtscript/registeringvalues/main.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 documentation of the Qt Toolkit. diff --git a/src/script/doc/src/ecmascript.qdoc b/src/script/doc/src/ecmascript.qdoc index eed0d48..84116c7 100644 --- a/src/script/doc/src/ecmascript.qdoc +++ b/src/script/doc/src/ecmascript.qdoc @@ -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 documentation of the Qt Toolkit. @@ -28,10 +28,10 @@ /*! \page ecmascript.html \title ECMAScript Reference - \brief A list of objects, functions and properties supported by QtScript. + \brief A list of objects, functions and properties supported by Qt Script. This reference contains a list of built-in objects, functions and - properties supported by QtScript. For a detailed description, see + properties supported by Qt Script. For a detailed description, see the \l{ECMA-262} specification. \tableofcontents diff --git a/src/script/doc/src/external-resources.qdoc b/src/script/doc/src/external-resources.qdoc index 885a8e0..cb6af34 100644 --- a/src/script/doc/src/external-resources.qdoc +++ b/src/script/doc/src/external-resources.qdoc @@ -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 documentation of the Qt Toolkit. diff --git a/src/script/doc/src/qtscript-index.qdoc b/src/script/doc/src/qtscript-index.qdoc index aabf584..ff4013b 100644 --- a/src/script/doc/src/qtscript-index.qdoc +++ b/src/script/doc/src/qtscript-index.qdoc @@ -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 documentation of the Qt Toolkit. @@ -182,7 +182,7 @@ When the argument is a QObject slot, the argument types of the signal and slot do not necessarily have to be compatible; - QtScript will, if necessary, perform conversion of the signal + Qt Script will, if necessary, perform conversion of the signal arguments to match the argument types of the slot. To disconnect from a signal, you invoke the signal's @@ -254,7 +254,7 @@ \section3 Overloaded Signals and Slots - When a signal or slot is overloaded, QtScript will attempt to + When a signal or slot is overloaded, Qt Script will attempt to pick the right overload based on the actual types of the QScriptValue arguments involved in the function invocation. For example, if your class has slots \c{myOverloadedSlot(int)} and \c{myOverloadedSlot(QString)}, the following @@ -268,7 +268,7 @@ \snippet code/doc_src_qtscript.js 12 - If the overloads have different number of arguments, QtScript will + If the overloads have different number of arguments, Qt Script will pick the overload with the argument count that best matches the actual number of arguments passed to the slot. @@ -279,7 +279,7 @@ \section2 Accessing Properties The properties of the QObject are available as properties - of the corresponding QtScript object. When you manipulate + of the corresponding Qt Script object. When you manipulate a property in script code, the C++ get/set method for that property will automatically be invoked. For example, if your C++ class has a property declared as follows: @@ -294,7 +294,7 @@ Every named child of the QObject (that is, for which QObject::objectName() is not an empty string) is by default available as - a property of the QtScript wrapper object. For example, + a property of the Qt Script wrapper object. For example, if you have a QDialog with a child widget whose \c{objectName} property is \c{"okButton"}, you can access this object in script code through the expression @@ -366,7 +366,7 @@ With QScriptEngine::AutoOwnership the ownership is based on whether the QObject has a parent or not. - If the QtScript garbage collector finds that the QObject is no + If the Qt Script garbage collector finds that the QObject is no longer referenced within the script environment, the QObject will be deleted \e{only} if it does not have a parent. @@ -390,7 +390,7 @@ QScriptEngine::newQObject() can take a third argument which allows you to control various aspects of the access to the QObject through - the QtScript wrapper object it returns. + the Qt Script wrapper object it returns. QScriptEngine::ExcludeChildObjects specifies that child objects of the QObject should not appear as properties of the wrapper object. @@ -405,7 +405,7 @@ QScriptEngine::AutoCreateDynamicProperties specifies that properties that don't already exist in the QObject should be created as dynamic - properties of the QObject, rather than as properties of the QtScript + properties of the QObject, rather than as properties of the Qt Script wrapper object. If you want new properties to truly become persistent properties of the QObject, rather than properties that are destroyed along with the wrapper object (and that aren't shared if the QObject @@ -442,14 +442,14 @@ properties of the QMetaObject wrapper object that can be created with QScriptEngine::newQMetaObject(). - \section1 Conversion Between QtScript and C++ Types + \section1 Conversion Between Qt Script and C++ Types - QtScript will perform type conversion when a value needs to be + Qt Script will perform type conversion when a value needs to be converted from the script side to the C++ side or vice versa; for instance, when a C++ signal triggers a script function, when you access a QObject property in script code, or when you call QScriptEngine::toScriptValue() or - QScriptEngine::fromScriptValue() in C++. QtScript provides default + QScriptEngine::fromScriptValue() in C++. Qt Script provides default conversion operations for many of the built-in Qt types. You can change the conversion operation for a type (including your custom C++ types) by registering your own conversion functions with @@ -511,7 +511,7 @@ the result is an empty QList<int>. \endtable - Additionally, QtScript will handle the following cases: + Additionally, Qt Script will handle the following cases: \list \li If the QScriptValue is a QObject and the target type name ends with @@ -592,7 +592,7 @@ This section explains how to implement application objects and provides the necessary technical background material. - \section2 Making a C++ object available to Scripts Written in QtScript + \section2 Making a C++ object available to Scripts Written in Qt Script Making C++ classes and objects available to a scripting language is not trivial because scripting languages tend to be more dynamic than @@ -608,7 +608,7 @@ (Meta-Object Compiler). Classes that wish to take advantage of the meta-object facilities are either subclasses of QObject, or use the \c{Q_OBJECT} macro. Qt has used this approach for many years and it has - proven to be solid and reliable. QtScript uses this meta-object + proven to be solid and reliable. Qt Script uses this meta-object technology to provide scripters with dynamic access to C++ classes and objects. @@ -619,14 +619,14 @@ how to implement application objects. However, this knowledge is not essential in the simplest cases. - To make an object available in QtScript, it must derive from + To make an object available in Qt Script, it must derive from QObject. All classes which derive from QObject can be introspected and can provide the information needed by the scripting engine at run-time; e.g., class name, functions, signatures. Because we obtain the information we need about classes dynamically at run-time, there is no need to write wrappers for QObject derived classes. - \section2 Making C++ Class Member Functions Available in QtScript + \section2 Making C++ Class Member Functions Available in Qt Script The meta-object system also makes information about signals and slots dynamically available at run-time. By default, for QObject subclasses, @@ -634,7 +634,7 @@ This is very convenient because, in practice, we normally only want to make specially chosen functions available to scripters. When you create a QObject subclass, make sure that the functions you want to expose to - QtScript are public slots. + Qt Script are public slots. For example, the following class definition enables scripting only for certain functions: @@ -642,8 +642,8 @@ \snippet code/doc_src_qtscript.cpp 19 In the example above, aNonScriptableFunction() is not declared as a - slot, so it will not be available in QtScript. The other three - functions will automatically be made available in QtScript because + slot, so it will not be available in Qt Script. The other three + functions will automatically be made available in Qt Script because they are declared in the \c{public slots} section of the class definition. @@ -653,7 +653,7 @@ \snippet code/doc_src_qtscript.cpp 20 Once declared with \c{Q_INVOKABLE}, the method can be invoked from - QtScript code just as if it were a slot. Although such a method is + Qt Script code just as if it were a slot. Although such a method is not a slot, you can still specify it as the target function in a call to \c{connect()} in script code; \c{connect()} accepts both native and non-native functions as targets. @@ -664,10 +664,10 @@ to supply conversion functions. This is done using the qScriptRegisterMetaType() function. - \section2 Making C++ Class Properties Available in QtScript + \section2 Making C++ Class Properties Available in Qt Script In the previous example, if we wanted to get or set a property using - QtScript we would have to write code like the following: + Qt Script we would have to write code like the following: \snippet code/doc_src_qtscript.js 21 @@ -691,7 +691,7 @@ the names of the setter and getter functions as arguments. If you don't want a property of your class to be accessible in - QtScript, you set the \c{SCRIPTABLE} attribute to \c false when + Qt Script, you set the \c{SCRIPTABLE} attribute to \c false when declaring the property; by default, the \c{SCRIPTABLE} attribute is \c true. For example: @@ -705,10 +705,10 @@ is called. This connection is established using the QObject::connect() function. - The signals and slots mechanism is also available to QtScript + The signals and slots mechanism is also available to Qt Script programmers. The code to declare a signal in C++ is the same, regardless of whether the signal will be connected to a slot in C++ - or in QtScript. + or in Qt Script. \snippet code/doc_src_qtscript.cpp 25 @@ -722,9 +722,9 @@ \section2 Design of Application Objects The previous section described how to implement C++ objects which - can be used in QtScript. Application objects are the same kind of + can be used in Qt Script. Application objects are the same kind of objects, and they make your application's functionality available to - QtScript scripters. Since the C++ application is already written + Qt Script scripters. Since the C++ application is already written in Qt, many objects are already QObjects. The easiest approach would be to simply add all these QObjects as application objects to the scripting engine. For small applications this might be sufficient, @@ -747,7 +747,7 @@ If you have a slot that returns a QObject pointer, you should note that, by default, Qt Script only handles conversion of the types QObject* and QWidget*. This means that if your slot is declared - with a signature like "MyObject* getMyObject()", QtScript doesn't + with a signature like "MyObject* getMyObject()", Qt Script doesn't automatically know that MyObject* should be handled in the same way as QObject* and QWidget*. The simplest way to solve this is to only use QObject* and QWidget* in the method signatures of your scripting @@ -1285,10 +1285,10 @@ In ECMAScript, inheritance is based on the concept of \e{shared prototype objects}; this is quite different from the class-based - inheritance familiar to C++ programmers. With QtScript, you can + inheritance familiar to C++ programmers. With Qt Script, you can associate a custom prototype object with a C++ type using QScriptEngine::setDefaultPrototype(); this is the key to providing - a script interface to that type. Since the QtScript module is built + a script interface to that type. Since the Qt Script module is built on top of Qt's meta-type system, this can be done for any C++ type. You might be wondering when exactly you would need to use this @@ -1314,25 +1314,25 @@ This section explains the underlying concepts of prototype-based inheritance. Once these concepts are understood, the associated - practices can be applied throughout the QtScript API in order to + practices can be applied throughout the Qt Script API in order to create well-behaved, consistent bindings to C++ that will fit nicely into the ECMAScript universe. - When experimenting with QtScript objects and inheritance, it can be + When experimenting with Qt Script objects and inheritance, it can be helpful to use the interactive interpreter included with the \l{Qt Script Examples}, located in \c{examples/script/qscript}. \section2 Prototype Objects and Shared Properties - The purpose of a QtScript \e{prototype object} is to define - behavior that should be shared by a set of other QtScript + The purpose of a Qt Script \e{prototype object} is to define + behavior that should be shared by a set of other Qt Script objects. We say that objects which share the same prototype object belong to the same \e{class} (again, on the technical side this should not to be confused with the class constructs of languages like C++ and Java; ECMAScript has no such construct). The basic prototype-based inheritance mechanism works as follows: Each - QtScript object has an internal link to another object, its + Qt Script object has an internal link to another object, its \e{prototype}. When a property is looked up in an object, and the object itself does not have the property, the property is looked up in the prototype object instead; if the prototype has the property, @@ -1365,7 +1365,7 @@ \section2 Defining Classes in a Prototype-Based Universe - In QtScript, a class is not defined explicitly; there is no + In Qt Script, a class is not defined explicitly; there is no \c{class} keyword. Instead, you define a new class in two steps: \list 1 @@ -1393,10 +1393,10 @@ Next, you want to set up \c{Person.prototype} as your prototype object; i.e., define the interface that should be common to all - \c{Person} objects. QtScript automatically creates a default + \c{Person} objects. Qt Script automatically creates a default prototype object (by the expression \c{new Object()}) for every script function; you can add properties to this object, or you can - assign your own custom object. (Generally speaking, any QtScript + assign your own custom object. (Generally speaking, any Qt Script object can act as prototype for any other object.) Here's an example of how you might want to override the @@ -1445,7 +1445,7 @@ same as that of \c{Person} objects, but with \c{Employee.prototype} added to the front of the chain. - \section2 Prototype-Based Programming with the QtScript C++ API + \section2 Prototype-Based Programming with the Qt Script C++ API You can use QScriptEngine::newFunction() to wrap native functions. When implementing a constructor function, @@ -1472,7 +1472,7 @@ You associate a prototype object with a C++ type by calling QScriptEngine::setDefaultPrototype(). Once this mapping is - established, QtScript will automatically assign the correct + established, Qt Script will automatically assign the correct prototype when a value of such a type is wrapped in a QScriptValue; either when you explicitly call QScriptEngine::toScriptValue(), or when a value of such a type is returned from a C++ slot and @@ -1637,7 +1637,7 @@ doesn't provide any debugging-specific functionality (e.g. setting breakpoints), but it is the basis of tools that do. - The QScriptEngineDebugger class introduced in Qt 4.5 provides a + The \l{Qt Script Tools} module provides a \l{Qt Script Debugger Manual}{Qt Script debugger} that can be embedded into your application. @@ -1661,7 +1661,7 @@ of the script function itself, so that it can be retrieved when the function is called. - \section1 Using QtScript Extensions + \section1 Using Qt Script Extensions The QScriptEngine::importExtension() function can be used to load plugins into a script engine. Plugins typically add some extra functionality to @@ -1670,7 +1670,7 @@ scripts. There are currently no script plugins shipped with Qt. If you are implementing some Qt Script functionality that you want other - Qt application developers to be able to use, \l{Creating QtScript Extensions} + Qt application developers to be able to use, \l{Creating Qt Script Extensions} {developing an extension} (e.g. by subclassing QScriptExtensionPlugin) is worth looking into. @@ -1723,7 +1723,7 @@ Once you are using qsTr() and/or qsTranslate() throughout your scripts, you can start producing translations of the user-visible text in your program. - The \l{Qt Linguist manual} provides further information about + The \l{Qt Linguist Manual} provides further information about Qt's translation tools, \e{Qt Linguist}, \c lupdate and \c lrelease. @@ -1798,11 +1798,11 @@ \section1 ECMAScript Compatibility - QtScript implements all the built-in objects and properties defined + Qt Script implements all the built-in objects and properties defined in the \l{ECMA-262} standard; see the \l{ECMAScript Reference}{ECMAScript reference} for an overview. - \section1 QtScript Extensions to ECMAScript + \section1 Qt Script Extensions to ECMAScript \list \li \c{__proto__} \br @@ -1876,4 +1876,3 @@ \brief Classes that add scripting capabilities to Qt applications. */ - diff --git a/src/script/doc/src/qtscript-module.qdoc b/src/script/doc/src/qtscript-module.qdoc index bb09817..5f19fd9 100644 --- a/src/script/doc/src/qtscript-module.qdoc +++ b/src/script/doc/src/qtscript-module.qdoc @@ -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 documentation of the Qt Toolkit. @@ -31,10 +31,10 @@ \since 4.3 \ingroup modules - \brief The QtScript module provides classes for making Qt applications scriptable. + \brief The Qt Script module provides classes for making Qt applications scriptable. - The QtScript module only provides core scripting facilities; the - QtScriptTools module provides additional Qt Script-related + The Qt Script module only provides core scripting facilities; the + Qt Script Tools module provides additional Qt Script-related components that application developers may find useful. This module is mainly provided for backwards compatibility reasons @@ -52,13 +52,13 @@ \snippet code/doc_src_qtscript.pro 1 For detailed information on how to make your application - scriptable with QtScript, see \l{Making Applications + scriptable with Qt Script, see \l{Making Applications Scriptable}. \section1 License Information Qt Commercial Edition licensees that wish to distribute applications that - use the QtScript module need to be aware of their obligations under the + use the Qt Script module need to be aware of their obligations under the GNU Library General Public License (LGPL). Developers using the Open Source Edition can choose to redistribute @@ -70,7 +70,7 @@ sufficient for most use cases and is not dependent on LGPL code. \legalese - QtScript is licensed under the GNU Library General Public License. + Qt Script is licensed under the GNU Library General Public License. Individual contributor names and copyright dates can be found inline in the code. diff --git a/src/script/doc/src/qtscriptdebugger-manual.qdoc b/src/script/doc/src/qtscriptdebugger-manual.qdoc index ad8bd80..7de9d6f 100644 --- a/src/script/doc/src/qtscriptdebugger-manual.qdoc +++ b/src/script/doc/src/qtscriptdebugger-manual.qdoc @@ -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 documentation of the Qt Toolkit. @@ -30,8 +30,8 @@ \title Qt Script Debugger Manual \brief A manual describing how to use the Qt Script debugger. - The Qt Script debugger is a tool for debugging script execution in - Qt applications that use Qt Script. Application developers can embed + The \l{Qt Script Tools} module provides a debugger for script execution in + Qt applications that use \l{Qt Script}. Application developers can embed the debugger into their application through the QScriptEngineDebugger class. This manual describes how to use the debugger. We assume that the reader is somewhat familiar with @@ -291,7 +291,7 @@ previously. \section3 ignore <breakpoint-id> <count> - + Sets the ignore-count of a breakpoint, i.e., the breakpoint will not stop the program execution unless it have been reached \c count times. This can, for instance, be useful in loops to stop at a @@ -356,7 +356,7 @@ \section3 eval <program> - Evaluates a program. + Evaluates a program. \section3 finish @@ -402,7 +402,7 @@ Selects the previous (inner) stack frame. The execution will not return to this frame, but you will get access to its local - variables. + variables. \section3 frame <index> diff --git a/src/script/doc/src/qtscriptextensions.qdoc b/src/script/doc/src/qtscriptextensions.qdoc index d8f37e3..294513f 100644 --- a/src/script/doc/src/qtscriptextensions.qdoc +++ b/src/script/doc/src/qtscriptextensions.qdoc @@ -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 documentation of the Qt Toolkit. @@ -27,10 +27,10 @@ /*! \page qtscriptextensions.html - \title Creating QtScript Extensions - \brief A guide to creating and using QtScript extensions. + \title Creating Qt Script Extensions + \brief A guide to creating and using Qt Script extensions. - QtScript extensions can make additional functionality available to scripts + Qt Script extensions can make additional functionality available to scripts evaluated by a QScriptEngine. Extensions are imported by calling the QScriptEngine::importExtension() function. diff --git a/src/script/parser/make-parser.sh b/src/script/parser/make-parser.sh index 8b56e41..f16ce07 100755 --- a/src/script/parser/make-parser.sh +++ b/src/script/parser/make-parser.sh @@ -1,7 +1,7 @@ #!/bin/sh ############################################################################# ## -## 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 the build configuration utility of the Qt Toolkit. diff --git a/src/script/parser/qscript.g b/src/script/parser/qscript.g index 4144a58..46e530f 100644 --- a/src/script/parser/qscript.g +++ b/src/script/parser/qscript.g @@ -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. @@ -62,7 +62,7 @@ /./**************************************************************************** ** -** 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. @@ -119,7 +119,7 @@ /:/**************************************************************************** ** -** 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/parser/qscriptast.cpp b/src/script/parser/qscriptast.cpp index e5e9d02..8c40c2f 100644 --- a/src/script/parser/qscriptast.cpp +++ b/src/script/parser/qscriptast.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/parser/qscriptast_p.h b/src/script/parser/qscriptast_p.h index c5b78b8..fdf92ae 100644 --- a/src/script/parser/qscriptast_p.h +++ b/src/script/parser/qscriptast_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/parser/qscriptastfwd_p.h b/src/script/parser/qscriptastfwd_p.h index 4c88231..3b512c3 100644 --- a/src/script/parser/qscriptastfwd_p.h +++ b/src/script/parser/qscriptastfwd_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/parser/qscriptastvisitor.cpp b/src/script/parser/qscriptastvisitor.cpp index 1337690..dfa52ef 100644 --- a/src/script/parser/qscriptastvisitor.cpp +++ b/src/script/parser/qscriptastvisitor.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/parser/qscriptastvisitor_p.h b/src/script/parser/qscriptastvisitor_p.h index 3116de5..9cb3850 100644 --- a/src/script/parser/qscriptastvisitor_p.h +++ b/src/script/parser/qscriptastvisitor_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/parser/qscriptgrammar.cpp b/src/script/parser/qscriptgrammar.cpp index eb6f9a6..49b03dd 100644 --- a/src/script/parser/qscriptgrammar.cpp +++ b/src/script/parser/qscriptgrammar.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/parser/qscriptgrammar_p.h b/src/script/parser/qscriptgrammar_p.h index 575fcc0..327b693 100644 --- a/src/script/parser/qscriptgrammar_p.h +++ b/src/script/parser/qscriptgrammar_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/parser/qscriptlexer.cpp b/src/script/parser/qscriptlexer.cpp index 6277fcf..2dad19c 100644 --- a/src/script/parser/qscriptlexer.cpp +++ b/src/script/parser/qscriptlexer.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/parser/qscriptlexer_p.h b/src/script/parser/qscriptlexer_p.h index edaa9af..c5e4abf 100644 --- a/src/script/parser/qscriptlexer_p.h +++ b/src/script/parser/qscriptlexer_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/parser/qscriptparser.cpp b/src/script/parser/qscriptparser.cpp index cef46c2..bf2ab6e 100644 --- a/src/script/parser/qscriptparser.cpp +++ b/src/script/parser/qscriptparser.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/parser/qscriptparser_p.h b/src/script/parser/qscriptparser_p.h index 6da1b61..805a946 100644 --- a/src/script/parser/qscriptparser_p.h +++ b/src/script/parser/qscriptparser_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/parser/qscriptsyntaxchecker.cpp b/src/script/parser/qscriptsyntaxchecker.cpp index 1849c60..0331cce 100644 --- a/src/script/parser/qscriptsyntaxchecker.cpp +++ b/src/script/parser/qscriptsyntaxchecker.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/parser/qscriptsyntaxchecker_p.h b/src/script/parser/qscriptsyntaxchecker_p.h index 2566e31..30e5deb 100644 --- a/src/script/parser/qscriptsyntaxchecker_p.h +++ b/src/script/parser/qscriptsyntaxchecker_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/script.pro b/src/script/script.pro index 9704e68..d998306 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -71,20 +71,6 @@ INCLUDEPATH += $$PWD include(script.pri) -symbian { - TARGET.UID3=0x2001B2E1 -} - -symbian { - symbian-abld|symbian-sbsv2 { - MMP_RULES += ALWAYS_BUILD_AS_ARM - } else { - QMAKE_CFLAGS -= --thumb - QMAKE_CXXFLAGS -= --thumb - } - QMAKE_CXXFLAGS.ARMCC += -OTime -O3 -} - integrity { CFLAGS += --diag_remark=236,82 } @@ -102,4 +88,4 @@ CONFIG(android) { QMAKE_CXXFLAGS_RELEASE -= -mthumb QMAKE_CXXFLAGS_RELEASE += -marm } -}
\ No newline at end of file +} |