From 1a2fc98242bea4a984e2aaad8c089ed912ee97ba Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 7 Dec 2012 10:53:28 +0100 Subject: Doc: Replace outdated macro Change-Id: I7750e9af3eee8cee5be202094acd1d3efc4b52b0 Reviewed-by: Jerome Pasion --- src/script/api/qscriptextensionplugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/script/api/qscriptextensionplugin.cpp') diff --git a/src/script/api/qscriptextensionplugin.cpp b/src/script/api/qscriptextensionplugin.cpp index 4926ca5..f63cb4f 100644 --- a/src/script/api/qscriptextensionplugin.cpp +++ b/src/script/api/qscriptextensionplugin.cpp @@ -41,7 +41,7 @@ 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} @@ -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) -- cgit v1.2.1 From 3f960df4c25b7e4e7d6aeaeecc62a083f8491b48 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 2 Jan 2013 12:57:45 +0100 Subject: Update copyright year in Digia's license headers Change-Id: Ic4a2739c8caf2eac95e4a72d8d38cfb912d5fe2b Reviewed-by: Akseli Salovaara Reviewed-by: Sergio Ahumada --- src/script/api/qscriptextensionplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/script/api/qscriptextensionplugin.cpp') diff --git a/src/script/api/qscriptextensionplugin.cpp b/src/script/api/qscriptextensionplugin.cpp index f63cb4f..425c15c 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. -- cgit v1.2.1 From 19550797aa16ee60fc19fdaf90832b4895612226 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Fri, 25 Jan 2013 20:40:36 +0800 Subject: Doc: Fix module name format Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtScript -> Qt Script QtScriptTools -> Qt Script Tools Change-Id: Icf6b2ea3829247475f8902334b615f9a9206cc51 Reviewed-by: Jerome Pasion --- src/script/api/qscriptextensionplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/script/api/qscriptextensionplugin.cpp') diff --git a/src/script/api/qscriptextensionplugin.cpp b/src/script/api/qscriptextensionplugin.cpp index 425c15c..a3e6fe7 100644 --- a/src/script/api/qscriptextensionplugin.cpp +++ b/src/script/api/qscriptextensionplugin.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE 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} */ /*! -- cgit v1.2.1