Call new QtQuick "QtQuick 2" instead "QtQuick 2.0"

Usually you talk about 'QtQuick 2' in contrast to the Qt 4.x stack (Qt
Quick 1). 'QtQuick 2.0' is just the exact import line we supported in Qt
5.0 ... The latest import we support in Qt 5.3 is 'import QtQuick 2.3'.

Change-Id: Ibc74eed98f721da1cd7d78a575e9ab82c37bf0f9
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

4 files changed, 15 insertions, 16 deletions

diff --git a/doc/src/graphics.qdoc b/doc/src/graphics.qdoc
index 418c28c1..76a696c7 100644
--- a/doc/src/graphics.qdoc
+++ b/doc/src/graphics.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.
@@ -124,8 +124,8 @@ the new classes in the \l {Qt GUI} module.
 
 \section1 Qt Quick scene graph
 
-Qt Quick 2.0 introduces an OpenGL (ES) 2.0 scene graph for
-rendering. It generally improves the performance of Qt Quick 2.0
+Qt Quick 2 introduces an OpenGL (ES) 2.0 scene graph for
+rendering. It generally improves the performance of Qt Quick 2
 significantly compared to the QGraphicsView/QPainter-based apprach
 used in earlier versions.
 
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 30c8ab65..a673c678 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.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.
@@ -142,7 +142,7 @@
 
     \section2 Graphics Drivers
 
-    For \l{Qt Quick} 2.0 to work, a graphics driver that provides OpenGL 2.1 or
+    For \l{Qt Quick} 2 to work, a graphics driver that provides OpenGL 2.1 or
     higher is required. The default driver from Windows is OpenGL 1.1. Qt
     includes a version of the \l{ANGLE} project which is included from the
     Windows Qt installers. ANGLE implements the
diff --git a/doc/src/qmlapp/performance.qdoc b/doc/src/qmlapp/performance.qdoc
index 7c53ed3d..48608114 100644
--- a/doc/src/qmlapp/performance.qdoc
+++ b/doc/src/qmlapp/performance.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.
@@ -147,10 +147,9 @@ conversion.
 
 If you must expose a QVariantMap to QML, use a "var" property rather than a "variant"
 property. In general, "property var" should be considered to be superior to
-"property variant" for every use-case in QtQuick 2.0 (note that "property variant"
-is marked as obsolete in the QtQuick 2.0 documentation), as it allows a true JavaScript
-reference to be stored (which can reduce the number of conversions required in certain
-expressions).
+"property variant" for every use-case from QtQuick 2.0 and newer (note that "property variant"
+is marked as obsolete), as it allows a true JavaScript reference to be stored (which can
+reduce the number of conversions required in certain expressions).
 
 \section2 Resolving Properties
 
@@ -702,7 +701,7 @@ an application already uses one.
 
 \section3 Don't Use Dynamic Roles
 
-The ListModel element in \c {QtQuick 2.0} is much more performant than in \c {QtQuick 1.0}. The
+The ListModel element in QtQuick 2 is much more performant than in QtQuick 1. The
 performance improvements mainly come from assumptions about the type of roles within each
 element in a given model - if the type doesn't change, the caching performance improves
 dramatically. If the type can change dynamically from element to element, this optimization
@@ -827,7 +826,7 @@ See the upcoming section on Rendering for more information on active but invisib
 
 \section1 Rendering
 
-The scene graph used for rendering in \c {QtQuick 2.0} allows highly dynamic, animated user
+The scene graph used for rendering in QtQuick 2 allows highly dynamic, animated user
 interfaces to be rendered fluidly at 60 FPS. There are some things which can
 dramatically decrease rendering performance, however, and developers should be careful
 to avoid these pitfalls wherever possible.
diff --git a/doc/src/qmlapp/porting.qdoc b/doc/src/qmlapp/porting.qdoc
index c2dea280..edb1c174 100644
--- a/doc/src/qmlapp/porting.qdoc
+++ b/doc/src/qmlapp/porting.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.
@@ -50,7 +50,7 @@ There are very few changes in the QML language that affect the porting of existi
 
 \section1 QtQuick Module
 
-The \c QtQuick module has been updated to version 2.0. All QML applications should update their import
+The QtQuick module has been updated to version 2. All QML applications should update their import
 statements to use the new version:
 
 \code
@@ -83,7 +83,7 @@ Graphics View framework backend used in \l {Qt Quick 1}.
 
 \section2 Behavioral Changes
 
-\c {QtQuick 2.0} includes a number of behavioral changes and you should thoroughly test your applications after
+QtQuick 2 includes a number of behavioral changes and you should thoroughly test your applications after
 porting. These changes will not necessarily lead to run-time errors, but may break certain assumptions in your code.
 Below are the prominent changes to be aware of when porting your applications.
 
@@ -97,7 +97,7 @@ Item opacity and visibility:
     \tt {(visible && opacity > 0.0)}.
 \li Previously, if an item was in a positioner (i.e. a \l Row, \l Column, \l Grid and \l Flow)
     and the item's \c opacity changed to 0, or its \c visible value became \c false, the positioner
-    would remove the item from its layout and collapse the space for that item. In \c {QtQuick 2.0}, this
+    would remove the item from its layout and collapse the space for that item. In QtQuick 2, this
     now only happens when an item's \c visible is \c false; the item opacity no longer affects whether
     the item is laid out. (This is consistent with the existing behavior of ListView and GridView).
 \endlist