diff options
| author | Eskil Abrahamsen Blomfeldt <[email protected]> | 2013-02-08 16:27:41 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <[email protected]> | 2013-02-08 16:31:20 +0100 |
| commit | 84f9848fd9f20536b18834a54ef15c6a65f8a682 (patch) | |
| tree | c31353dd1434692b2b4f351126b3abcd8460b8a8 /doc/src/examples | |
| parent | e7a8eef49d6d205e6cb549e879a27af4fe7fcce4 (diff) | |
| parent | 689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (diff) | |
Merge branch 'dev' into androidwip/android
Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc
Diffstat (limited to 'doc/src/examples')
| -rw-r--r-- | doc/src/examples/context2d.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/examples/defaultprototypes.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/examples/helloscript.qdoc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/examples/context2d.qdoc b/doc/src/examples/context2d.qdoc index 0a544db..0bc364f 100644 --- a/doc/src/examples/context2d.qdoc +++ b/doc/src/examples/context2d.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/doc/src/examples/defaultprototypes.qdoc b/doc/src/examples/defaultprototypes.qdoc index 40df6fc..4e63b5c 100644 --- a/doc/src/examples/defaultprototypes.qdoc +++ b/doc/src/examples/defaultprototypes.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. @@ -35,7 +35,7 @@ \image defaultprototypes-example.png With QScriptEngine::setDefaultPrototype() you can specify - a QtScript object that defines a scripting interface for + a Qt Script object that defines a scripting interface for a C++ type; Qt Script operations on values of such types will then be delegated to your prototype object. In this example, a simple scripting interface for QListWidgetItem is diff --git a/doc/src/examples/helloscript.qdoc b/doc/src/examples/helloscript.qdoc index 3c99130..dde244c 100644 --- a/doc/src/examples/helloscript.qdoc +++ b/doc/src/examples/helloscript.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. |