aboutsummaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-09-28 18:25:16 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-29 09:54:41 +0200
commit144c766e95483042eac8ffca6794815e8dd45da9 (patch)
treef8428310702a08b9776cfa260eaa2f7cdc316a5d /doc/src
parent07020f1cffbd1effa800a599f6c389e8f60c9e8d (diff)
Separate the QtQuick 1 and 2 whatsnew docs.
Change-Id: Ifb2d2604dff3a19ba03f5e8d82cd0dd8b6d8744a Reviewed-on: http://codereview.qt-project.org/5688 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/declarativeui.qdoc2
-rw-r--r--doc/src/declarative/whatsnew.qdoc173
-rw-r--r--doc/src/qtquick1/declarativeui.qdoc4
-rw-r--r--doc/src/qtquick1/whatsnew.qdoc47
4 files changed, 8 insertions, 218 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index cecccf6254..6f79cffdb2 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -50,7 +50,7 @@ Qt applications.
\o \l{QML for Qt Programmers}{QML Programming for Qt Programmers}
\o \l{Getting Started Programming with QML}
-\o \l{What's new in Qt Quick}{What's New in the Qt Quick Release}
+\o \l{What's New in QtQuick 2}{What's New in the Qt Quick Release}
\o \l{QML Examples and Demos}
\endlist
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
index ea575a67b0..044ce02a6d 100644
--- a/doc/src/declarative/whatsnew.qdoc
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -26,8 +26,8 @@
****************************************************************************/
/*!
-\title What's New in Qt Quick
-\page qtquick-whatsnew.html
+\title What's New in Qt Quick 2
+\page qtquick2-whatsnew.html
\section1 Qt 5.0.0 includes QtQuick 2.0
@@ -131,173 +131,6 @@ QDeclarativeView and QDeclarativeItem headers are now in the QtQuick 1 module, i
"import QtQuick 1.0" loads the module dynamically. To deploy QtQuick 1 applications
the library (lib/libQtQuick1*) and plugin (imports/QtQuick/) must be installed.
+\sa {What's New in Qt Quick 1}{What's New in Qt Quick 1}
-\section1 Qt 4.7.4 includes QtQuick 1.1
-
-QtQuick 1.1 is a minor feature update. \e {import QtQuick 1.1} to use the new
-features.
-
-\section2 PinchArea
-
-PinchArea provides support for the common two finger pinch gesture.
-
-\section2 LayoutMirroring attached property
-
-\l {LayoutMirroring}{Layout mirroring} is useful when you need to support both
-left-to-right and right-to-left layout versions of your application that target
-different language areas.
-
-\section2 Anchors
-
-Added the following property:
-\list
-\o \l {Item::}{anchors.mirrored}
-\endlist
-
-\section2 Text
-
-Added the following properties:
-\list
-\o \l {Text::}{lineHeight}
-\o \l {Text::}{lineHeightMode}
-\o \l {Text::}{lineCount}
-\o \l {Text::}{maximumLineCount}
-\o \l {Text::}{truncated}
-\o \l {Text::}{effectiveHorizontalAlignment}
-\endlist
-
-horizontalAlignment now accepts Text.AlignJustify alignment mode.
-
-\section2 TextEdit
-
-Added the following properties, methods and signal handlers:
-\list
-\o \l {TextEdit::}{canPaste}
-\o \l {TextEdit::}{lineCount}
-\o \l {TextEdit::}{inputMethodComposing}
-\o \l {TextEdit::}{mouseSelectionMode}
-\o \l {TextEdit::}{effectiveHorizontalAlignment}
-\o \l {TextEdit::}{deselect()}
-\o \l {TextEdit::}{isRightToLeft()}
-\o \l {TextEdit::}{moveCursorSelection()} to enable selection by word
-\o \l {TextEdit::}{onLinkActivated}
-\endlist
-
-\section2 TextInput
-
-Added the following properties and methods:
-\list
-\o \l {TextInput::}{canPaste}
-\o \l {TextInput::}{inputMethodComposing}
-\o \l {TextInput::}{mouseSelectionMode}
-\o \l {TextInput::}{effectiveHorizontalAlignment}
-\o \l {TextInput::}{deselect()}
-\o \l {TextInput::}{isRightToLeft()}
-\o \l {TextInput::}{moveCursorSelection()} to enable selection by word
-\endlist
-
-\section2 Image, BorderImage and AnimatedImage
-
-Added the following properties:
-\list
-\o \l{Image::}{cache}
-\o \l{Image::}{mirror}
-\endlist
-
-\section2 Item
-
-Added the following properties:
-\list
-\o \l{Item::}{implicitWidth} and \l{Item::}{implicitHeight}
-\endlist
-
-\section2 Flickable
-
-Added the following methods:
-\list
-\o \l{Flickable::}{resizeContent()}
-\o \l{Flickable::}{returnToBounds()}
-\endlist
-
-\section2 MouseArea
-
-Added the following property:
-\list
-\o \l{MouseArea::}{preventStealing}
-\endlist
-
-\section2 ListView and GridView
-
-Added the following properties and methods:
-\list
-\o \l{ListView::}{layoutDirection}
-\o \l{ListView::}{effectiveLayoutDirection}
-\o \l{ListView::}{positionViewAtBeginning()}
-\o \l{ListView::}{positionViewAtEnd()}
-\endlist
-
-\section2 Flow, Grid and Row
-
-Added the following properties:
-\list
-\o \l{Flow::}{layoutDirection}
-\o \l{Flow::}{effectiveLayoutDirection}
-\endlist
-
-\section2 Repeater
-
-Added the following methods and signal handlers:
-\list
-\o \l{Repeater::}{onItemAdded}
-\o \l{Repeater::}{onItemRemoved}
-\o \l{Repeater::}{itemAt()}
-\endlist
-
-\section2 Component
-
-\list
-\o The \l{Component::}{createObject()} method now accepts a map of initial
-property values for the created object.
-\endlist
-
-\section2 Qt
-
-\list
-\o Added the \l {QML:Qt::application}{Qt.application} object to hold generic
-global application properties.
-\endlist
-
-\section2 Other changes
-
-\list
-\o Functions can be \l{Property Binding#Property Binding}{assigned to properties from JavaScript}
-to create property bindings.
-\o QtQuick now supports Right to Left layout in positioners, views, anchors and text elements.
-\endlist
-
-
-\section1 Qt 4.7.1
-
-\section2 QtQuick namespace
-
-In prior Qt releases, all the Qt Quick elements were available in the \e Qt
-namespace. Starting with Qt 4.7.1, the elements are also available in the
-\e QtQuick namespace, which improves naming consistency, and allows the
-development of Qt Quick to occur at a faster rate than Qt's usual minor release
-schedule.
-
-The change for developers is very simple - where you previously wrote
-\e {import Qt 4.7}, just replace it with \e {import QtQuick 1.0}, like this:
-
-\code
-import QtQuick 1.0
-
-Text {
- text: "Welcome to QtQuick 1.0!"
-}
-\endcode
-
-\e {import Qt 4.7} continues to work so existing applications won't break even
-if they aren't updated, but it is recommended that all import statements be
-modified to the new form.
*/
diff --git a/doc/src/qtquick1/declarativeui.qdoc b/doc/src/qtquick1/declarativeui.qdoc
index d89ca53dbb..568eaf9ba4 100644
--- a/doc/src/qtquick1/declarativeui.qdoc
+++ b/doc/src/qtquick1/declarativeui.qdoc
@@ -27,7 +27,7 @@
/*!
\title Qt Quick
-\page qtquick.html
+\page qtquick1.html
\ingroup qt-gui-concepts
\brief Qt Quick provides a declarative framework for building highly
@@ -50,7 +50,7 @@ Qt applications.
\o \l{QML for Qt Programmers}{QML Programming for Qt Programmers}
\o \l{Getting Started Programming with QML}
-\o \l{What's new in Qt Quick}{What's New in the Qt Quick Release}
+\o \l{What's new in Qt Quick 1}{What's New in the Qt Quick Release}
\o \l{QML Examples and Demos}
\endlist
diff --git a/doc/src/qtquick1/whatsnew.qdoc b/doc/src/qtquick1/whatsnew.qdoc
index d3db1346ea..9cf31d5dcf 100644
--- a/doc/src/qtquick1/whatsnew.qdoc
+++ b/doc/src/qtquick1/whatsnew.qdoc
@@ -26,51 +26,8 @@
****************************************************************************/
/*!
-\title What's New in Qt Quick
-\page qtquick-whatsnew.html
-
-\section1 Qt 5.0.0 includes QtQuick 2.0
-
-QtQuick 2.0 is a major update.
-
-MouseArea now propagates clicked, doubleClicked and pressAndHold differently to pressed.
-These will now be propagated to the highest-stacking-order enabled MouseArea which has a handler for them.
-You can still ignore these events in the handler to let them pass through.
-
-The Binding element can now be used as a value source, and will also restore any previously
-set binding when its \e when clause becomes false.
-
-QDeclarativeExpression can now be directly (and more efficiently) constructed from a
-QDeclarativeScriptString.
-
-Flickable: added dragging, draggingHorizontally and draggingVerically properties.
-
-Image has two new properties: horizontalAlignment and verticalAlignment. It also has a new value for
-fillMode (Image.Pad) that does not transform the image.
-
-The Loader element now only emits the \c sourceChanged signal when the source is changed and the
-\c sourceComponentChanged signal when the sourceComponent is changed. It used to emit both signals when one
-of the properties was changed.
-
-\section2 QtQuick 1 is now a separate library and module
-
-Writing C++ applications using QtQuick 1 specific API, i.e. QDeclarativeView or QDeclarativeItem
-requires adding the "qtquick1" module to the .pro file, e.g. QT += declarative qtquick1
-
-QDeclarativeView and QDeclarativeItem headers are now in the QtQuick 1 module, i.e.
-#include <QtQuick1/QDeclarativeView>
-#include <QtQuick1/QDeclarativeItem>
-
-"import QtQuick 1.0" loads the module dynamically. To deploy QtQuick 1 applications
-the library (lib/libQtQuick1*) and plugin (imports/QtQuick/) must be installed.
-
-
-\section2 PathView
-
-Added the following properties:
-\list
-\o \l {PathView::}{currentItem}
-\endlist
+\title What's New in Qt Quick 1
+\page qtquick1-whatsnew.html
\section1 Qt 4.7.4 includes QtQuick 1.1