diff options
author | Kai Koehne <kai.koehne@digia.com> | 2014-05-06 11:19:35 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-07 08:38:25 +0200 |
commit | 0cd4e38612a3ae6761b5dba72486bc4479214993 (patch) | |
tree | ee11062657ad8148b75c26bb5b683f8d4565045b | |
parent | 9f17dbb683e549933dcec22e68eb74eb11e48cd3 (diff) | |
download | qtdoc-0cd4e38612a3ae6761b5dba72486bc4479214993.tar.gz |
Bump QtQuick import to 2.3
It doesn't make sense to advocate the use of QtQuick 2.0 anymore. We
can expect that people target Qt 5.3 in the Qt 5.3 documentation ...
Change-Id: I6ac8dca59a2717fe6d8baec13d968bd74070e90e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
36 files changed, 88 insertions, 88 deletions
diff --git a/doc/snippets/qmlapp/codingconventions/dotproperties.qml b/doc/snippets/qmlapp/codingconventions/dotproperties.qml index bbb40a77..8f413877 100644 --- a/doc/snippets/qmlapp/codingconventions/dotproperties.qml +++ b/doc/snippets/qmlapp/codingconventions/dotproperties.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.3 Item { diff --git a/doc/snippets/qmlapp/codingconventions/javascript-imports.qml b/doc/snippets/qmlapp/codingconventions/javascript-imports.qml index fd8301ce..6c5a62da 100644 --- a/doc/snippets/qmlapp/codingconventions/javascript-imports.qml +++ b/doc/snippets/qmlapp/codingconventions/javascript-imports.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.3 //![0] import "myscript.js" as Script diff --git a/doc/snippets/qmlapp/codingconventions/javascript.qml b/doc/snippets/qmlapp/codingconventions/javascript.qml index 72c954f6..75284840 100644 --- a/doc/snippets/qmlapp/codingconventions/javascript.qml +++ b/doc/snippets/qmlapp/codingconventions/javascript.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.3 Rectangle { diff --git a/doc/snippets/qmlapp/codingconventions/lists.qml b/doc/snippets/qmlapp/codingconventions/lists.qml index c4512918..a26bb37b 100644 --- a/doc/snippets/qmlapp/codingconventions/lists.qml +++ b/doc/snippets/qmlapp/codingconventions/lists.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.3 Item { Item { diff --git a/doc/snippets/qmlapp/codingconventions/photo.qml b/doc/snippets/qmlapp/codingconventions/photo.qml index 480737c9..d4b2f5bf 100644 --- a/doc/snippets/qmlapp/codingconventions/photo.qml +++ b/doc/snippets/qmlapp/codingconventions/photo.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.3 //! [0] Rectangle { diff --git a/doc/snippets/qmlapp/qml-extending-types/components/Button.qml b/doc/snippets/qmlapp/qml-extending-types/components/Button.qml index 898d08aa..96fcc6a3 100644 --- a/doc/snippets/qmlapp/qml-extending-types/components/Button.qml +++ b/doc/snippets/qmlapp/qml-extending-types/components/Button.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] // Button.qml -import QtQuick 2.0 +import QtQuick 2.3 Rectangle { width: 100; height: 100 diff --git a/doc/snippets/qmlapp/qml-extending-types/components/application.qml b/doc/snippets/qmlapp/qml-extending-types/components/application.qml index 96e2cc8d..fae793cb 100644 --- a/doc/snippets/qmlapp/qml-extending-types/components/application.qml +++ b/doc/snippets/qmlapp/qml-extending-types/components/application.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] // application.qml -import QtQuick 2.0 +import QtQuick 2.3 Column { Button { width: 50; height: 50 } diff --git a/doc/snippets/qmlapp/qtbinding/resources/main.qml b/doc/snippets/qmlapp/qtbinding/resources/main.qml index 410b3f68..9ccf7953 100644 --- a/doc/snippets/qmlapp/qtbinding/resources/main.qml +++ b/doc/snippets/qmlapp/qtbinding/resources/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -40,7 +40,7 @@ //![0] // main.qml -import QtQuick 2.0 +import QtQuick 2.3 Image { source: "images/background.png" } //![0] diff --git a/doc/snippets/qmlapp/usecases/Button.qml b/doc/snippets/qmlapp/usecases/Button.qml index 6c4c0f7c..3a25342e 100644 --- a/doc/snippets/qmlapp/usecases/Button.qml +++ b/doc/snippets/qmlapp/usecases/Button.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Rectangle { id: container diff --git a/doc/snippets/qmlapp/usecases/MyText.qml b/doc/snippets/qmlapp/usecases/MyText.qml index d58a4036..24b7095f 100644 --- a/doc/snippets/qmlapp/usecases/MyText.qml +++ b/doc/snippets/qmlapp/usecases/MyText.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Text { color: "lightsteelblue" diff --git a/doc/snippets/qmlapp/usecases/animations.qml b/doc/snippets/qmlapp/usecases/animations.qml index ce90bc02..660e5ef2 100644 --- a/doc/snippets/qmlapp/usecases/animations.qml +++ b/doc/snippets/qmlapp/usecases/animations.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { diff --git a/doc/snippets/qmlapp/usecases/integratingjs-inline.qml b/doc/snippets/qmlapp/usecases/integratingjs-inline.qml index 24758d4e..76a36008 100644 --- a/doc/snippets/qmlapp/usecases/integratingjs-inline.qml +++ b/doc/snippets/qmlapp/usecases/integratingjs-inline.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { id: container diff --git a/doc/snippets/qmlapp/usecases/integratingjs.qml b/doc/snippets/qmlapp/usecases/integratingjs.qml index 9e7ed2a3..c22ac926 100644 --- a/doc/snippets/qmlapp/usecases/integratingjs.qml +++ b/doc/snippets/qmlapp/usecases/integratingjs.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 import "myscript.js" as Logic Item { diff --git a/doc/snippets/qmlapp/usecases/layouts.qml b/doc/snippets/qmlapp/usecases/layouts.qml index e9483d2b..12d17194 100644 --- a/doc/snippets/qmlapp/usecases/layouts.qml +++ b/doc/snippets/qmlapp/usecases/layouts.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![import] -import QtQuick 2.0 +import QtQuick 2.3 //![import] diff --git a/doc/snippets/qmlapp/usecases/styling-text.qml b/doc/snippets/qmlapp/usecases/styling-text.qml index 0c68a11a..31335104 100644 --- a/doc/snippets/qmlapp/usecases/styling-text.qml +++ b/doc/snippets/qmlapp/usecases/styling-text.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { id: root diff --git a/doc/snippets/qmlapp/usecases/styling.qml b/doc/snippets/qmlapp/usecases/styling.qml index b46b9e3d..32aff3b2 100644 --- a/doc/snippets/qmlapp/usecases/styling.qml +++ b/doc/snippets/qmlapp/usecases/styling.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { width: 320 diff --git a/doc/snippets/qmlapp/usecases/text.qml b/doc/snippets/qmlapp/usecases/text.qml index c7adc127..cb514f53 100644 --- a/doc/snippets/qmlapp/usecases/text.qml +++ b/doc/snippets/qmlapp/usecases/text.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { id: root diff --git a/doc/snippets/qmlapp/usecases/userinput-keys.qml b/doc/snippets/qmlapp/usecases/userinput-keys.qml index 73b42b2f..46d58954 100644 --- a/doc/snippets/qmlapp/usecases/userinput-keys.qml +++ b/doc/snippets/qmlapp/usecases/userinput-keys.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { id: root diff --git a/doc/snippets/qmlapp/usecases/userinput.qml b/doc/snippets/qmlapp/usecases/userinput.qml index 5aabcde1..056dcd68 100644 --- a/doc/snippets/qmlapp/usecases/userinput.qml +++ b/doc/snippets/qmlapp/usecases/userinput.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { id: root diff --git a/doc/snippets/qmlapp/usecases/visual-opacity.qml b/doc/snippets/qmlapp/usecases/visual-opacity.qml index d5a1e6f9..349bf12c 100644 --- a/doc/snippets/qmlapp/usecases/visual-opacity.qml +++ b/doc/snippets/qmlapp/usecases/visual-opacity.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { diff --git a/doc/snippets/qmlapp/usecases/visual-rects.qml b/doc/snippets/qmlapp/usecases/visual-rects.qml index 16cfd7ba..95f2e6a6 100644 --- a/doc/snippets/qmlapp/usecases/visual-rects.qml +++ b/doc/snippets/qmlapp/usecases/visual-rects.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { diff --git a/doc/snippets/qmlapp/usecases/visual-transforms.qml b/doc/snippets/qmlapp/usecases/visual-transforms.qml index 924f4b79..4cc8a000 100644 --- a/doc/snippets/qmlapp/usecases/visual-transforms.qml +++ b/doc/snippets/qmlapp/usecases/visual-transforms.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { diff --git a/doc/snippets/qmlapp/usecases/visual.qml b/doc/snippets/qmlapp/usecases/visual.qml index fe381136..23651608 100644 --- a/doc/snippets/qmlapp/usecases/visual.qml +++ b/doc/snippets/qmlapp/usecases/visual.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] -import QtQuick 2.0 +import QtQuick 2.3 Item { diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc index a000ba3e..1dc9986c 100644 --- a/doc/src/getting-started/gettingstartedqml.qdoc +++ b/doc/src/getting-started/gettingstartedqml.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -78,7 +78,7 @@ \l{Property Binding}{QML properties} to control its appearance and location. \code - import QtQuick 2.0 + import QtQuick 2.3 Rectangle { id: simpleButton @@ -93,7 +93,7 @@ } \endcode - First, the \c {import QtQuick 2.0} statement allows the + First, the \c {import QtQuick 2.3} statement allows the \l{Prototyping with qmlscene}{qmlscene} tool to import the QML types we will later use. This line must exist for every QML file. Notice that the version of Qt modules is included in the import statement. @@ -231,7 +231,7 @@ \c FileMenu.qml. \code - import QtQuick 2.0 \\ Import the main Qt QML module + import QtQuick 2.3 \\ Import the main Qt QML module import "folderName" \\ import the contents of a folder import "script.js" as Script \\ Import a Javascript file and name it as Script \endcode diff --git a/doc/src/graphics.qdoc b/doc/src/graphics.qdoc index 76a696c7..92625c3f 100644 --- a/doc/src/graphics.qdoc +++ b/doc/src/graphics.qdoc @@ -137,7 +137,7 @@ state of the items. On many platforms, the scene graph will even be rendered on a dedicated render thread while the GUI thread is preparing the next frame's state. -The scene graph is used when you import QtQuick 2.0 in your QML +The scene graph is used when you import QtQuick 2.x in your QML file, and use QQuickView to run it. \list diff --git a/doc/src/portingqmlapp.qdoc b/doc/src/portingqmlapp.qdoc index e0574c60..96466485 100644 --- a/doc/src/portingqmlapp.qdoc +++ b/doc/src/portingqmlapp.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -43,7 +43,7 @@ application work to Qt 5: \list 1 \li Open the \e{flickr} project using Qt Creator. \li Edit all the \c{.qml} files and replace the \c{import QtQuick 1.0} statements - with \c{import QtQuick 2.0}. + with \c{import QtQuick 2.3}. \li Add the additional \c{import QtQuick.XmlListModel 2.0} statement to \c{qml/common/RssModel.qml}. diff --git a/doc/src/qmlapp/debugging.qdoc b/doc/src/qmlapp/debugging.qdoc index ea94d269..54366a9b 100644 --- a/doc/src/qmlapp/debugging.qdoc +++ b/doc/src/qmlapp/debugging.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -131,7 +131,7 @@ from QML's import loading mechanisms. For example, for a simple QML file like this: \qml -import QtQuick 2.0 +import QtQuick 2.3 Rectangle { width: 100; height: 100 } \endqml diff --git a/doc/src/qmlapp/deployment.qdoc b/doc/src/qmlapp/deployment.qdoc index c64e1ec9..4795b2f6 100644 --- a/doc/src/qmlapp/deployment.qdoc +++ b/doc/src/qmlapp/deployment.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -64,7 +64,7 @@ For example, if there is a QML file, \c application.qml, it will look like this: \qml - import QtQuick 2.0 + import QtQuick 2.3 Rectangle { width: 100; height: 100; color: "red" } \endqml diff --git a/doc/src/qmlapp/firststepsqml.qdoc b/doc/src/qmlapp/firststepsqml.qdoc index 3e4a4a62..a15b8390 100644 --- a/doc/src/qmlapp/firststepsqml.qdoc +++ b/doc/src/qmlapp/firststepsqml.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -43,7 +43,7 @@ To use the \l{Qt Quick} module, a QML document needs to import it. The import syntax looks like this: \code -import QtQuick 2.0 +import QtQuick 2.3 \endcode The types and functionality that \l{Qt Quick} provides can now @@ -84,7 +84,7 @@ by the \c{QtQuick} import. Putting the import and object declaration together, we get a complete QML document: \qml -import QtQuick 2.0 +import QtQuick 2.3 Rectangle { width: 200 @@ -125,7 +125,7 @@ as \l{Signal and Handler Event System}{signals} and these signals are handled by For example, consider the following example: \qml -import QtQuick 2.0 +import QtQuick 2.3 Rectangle { width: 200 @@ -152,7 +152,7 @@ signal for touch events, so this code will also work on a mobile device. Keyboard user input can be similarly handled with a simple expression: \qml -import QtQuick 2.0 +import QtQuick 2.3 Rectangle { width: 200 @@ -189,7 +189,7 @@ were to change, the geometry of each child \l Rectangle would automatically update due to the property bindings. \qml -import QtQuick 2.0 +import QtQuick 2.3 Rectangle { width: 400 @@ -216,7 +216,7 @@ to a property's value. In the following example, a property is animated which then gets displayed in a \l Text area: \qml -import QtQuick 2.0 +import QtQuick 2.3 Rectangle { color: "lightgray" diff --git a/doc/src/qmlapp/glossary.qdoc b/doc/src/qmlapp/glossary.qdoc index 81d431f3..460493de 100644 --- a/doc/src/qmlapp/glossary.qdoc +++ b/doc/src/qmlapp/glossary.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -46,7 +46,7 @@ \li Qt Quick \li The standard library of types and functionality for the QML language, which is provided by the Qt Quick module, - and may be accessed with "import QtQuick 2.0" + and may be accessed with "import QtQuick 2.3". \row \li Type diff --git a/doc/src/qmlapp/performance.qdoc b/doc/src/qmlapp/performance.qdoc index 48608114..43c4e923 100644 --- a/doc/src/qmlapp/performance.qdoc +++ b/doc/src/qmlapp/performance.qdoc @@ -164,7 +164,7 @@ multiple times: \qml // bad.qml -import QtQuick 2.0 +import QtQuick 2.3 Item { width: 400 @@ -197,7 +197,7 @@ We could instead resolve the common base just once in the block: \qml // good.qml -import QtQuick 2.0 +import QtQuick 2.3 Item { width: 400 @@ -234,7 +234,7 @@ property resolution out of the loop, as follows: \qml // better.qml -import QtQuick 2.0 +import QtQuick 2.3 Item { width: 400 @@ -281,7 +281,7 @@ The following contrived example illustrates this point: \qml // bad.qml -import QtQuick 2.0 +import QtQuick 2.3 Item { id: root @@ -315,7 +315,7 @@ It could be rewritten as follows: \qml // good.qml -import QtQuick 2.0 +import QtQuick 2.3 Item { id: root @@ -399,7 +399,7 @@ tight loop, resulting in bad performance: \qml // bad.qml -import QtQuick 2.0 +import QtQuick 2.3 import Qt.example 1.0 SequenceTypeExample { @@ -427,7 +427,7 @@ something functionally equivalent but much faster would be: \qml // good.qml -import QtQuick 2.0 +import QtQuick 2.3 import Qt.example 1.0 SequenceTypeExample { @@ -462,7 +462,7 @@ aware of, in case you find yourself doing something like this: \qml // bad.qml -import QtQuick 2.0 +import QtQuick 2.3 import Qt.example 1.0 SequenceTypeExample { @@ -490,7 +490,7 @@ sometimes be beneficial: \qml // good.qml -import QtQuick 2.0 +import QtQuick 2.3 import Qt.example 1.0 SequenceTypeExample { @@ -1002,7 +1002,7 @@ to be of the type explicitly defined by the component, rather than its own impli Consider the following example: \qml -import QtQuick 2.0 +import QtQuick 2.3 Item { id: root diff --git a/doc/src/qmlapp/porting.qdoc b/doc/src/qmlapp/porting.qdoc index edb1c174..daf122ae 100644 --- a/doc/src/qmlapp/porting.qdoc +++ b/doc/src/qmlapp/porting.qdoc @@ -54,7 +54,7 @@ The QtQuick module has been updated to version 2. All QML applications should up statements to use the new version: \code -import QtQuick 2.0 +import QtQuick 2.3 \endcode diff --git a/doc/src/qmlapp/qmlscene.qdoc b/doc/src/qmlapp/qmlscene.qdoc index 856b3105..6cb214c3 100644 --- a/doc/src/qmlapp/qmlscene.qdoc +++ b/doc/src/qmlapp/qmlscene.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -96,7 +96,7 @@ property which does not exist within the document: \qml - import QtQuick 2.0 + import QtQuick 2.3 ListView { width: 200; height: 300 @@ -109,7 +109,7 @@ which contains a \c lottoNumbers.qml file like this: \qml - import QtQuick 2.0 + import QtQuick 2.3 ListModel { ListElement { number: 23 } @@ -125,7 +125,7 @@ document refers to a \c clock.time property: \qml - import QtQuick 2.0 + import QtQuick 2.3 Text { text: clock.time } \endqml @@ -133,7 +133,7 @@ \c time property in the root context: \qml - import QtQuick 2.0 + import QtQuick 2.3 QtObject { property int time: 54321 } \endqml diff --git a/doc/src/qmlapp/qtquicktest.qdoc b/doc/src/qmlapp/qtquicktest.qdoc index 722297b5..184d9dac 100644 --- a/doc/src/qmlapp/qtquicktest.qdoc +++ b/doc/src/qmlapp/qtquicktest.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -37,7 +37,7 @@ type: \code - import QtQuick 2.0 + import QtQuick 2.3 import QtTest 1.0 TestCase { diff --git a/doc/src/qmlapp/usecases/userinput.qdoc b/doc/src/qmlapp/usecases/userinput.qdoc index 185d7cbc..b370efff 100644 --- a/doc/src/qmlapp/usecases/userinput.qdoc +++ b/doc/src/qmlapp/usecases/userinput.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -72,7 +72,7 @@ entry and multi-line editing respectively. Here is all you need to get a working TextInput: \code -import QtQuick 2.0 +import QtQuick 2.3 TextInput { focus: true diff --git a/doc/src/snippets/declarative/imports/best-practices.qml b/doc/src/snippets/declarative/imports/best-practices.qml index 78ceb2b7..06777ab1 100644 --- a/doc/src/snippets/declarative/imports/best-practices.qml +++ b/doc/src/snippets/declarative/imports/best-practices.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -39,7 +39,7 @@ ****************************************************************************/ //! [imports] -import QtQuick 2.0 +import QtQuick 2.3 import QtQuick.Particles 2.0 import "subdirectory" import "script.js" |