diff options
Diffstat (limited to 'doc/src/declarative')
-rw-r--r-- | doc/src/declarative/qmltest.qdoc | 17 | ||||
-rw-r--r-- | doc/src/declarative/qtquick1.qdoc | 40 | ||||
-rw-r--r-- | doc/src/declarative/whatsnew.qdoc | 5 |
3 files changed, 1 insertions, 61 deletions
diff --git a/doc/src/declarative/qmltest.qdoc b/doc/src/declarative/qmltest.qdoc index e9340d8137..640275cf93 100644 --- a/doc/src/declarative/qmltest.qdoc +++ b/doc/src/declarative/qmltest.qdoc @@ -104,21 +104,4 @@ \code IMPORTPATH += $$PWD/../imports/my_module1 $$PWD/../imports/my_module2 \endcode - - \section1 Running tests with QtQuick 1 - - The \c{-qtquick1} option can be passed to a test binary to run - the tests using QDeclarativeView (QtQuick 1) rather than QQuickView (QtQuick 2): - - \code - tst_example -qtquick1 - \endcode - - To run tests with either QtQuick 1 or QtQuick 2, use - "import QtQuick 1.0" in your unit tests and then specify - compatibility mode to the QtQuick2 engine: - - \code - QMLSCENE_IMPORT_NAME=quick1 tst_example - \endcode */ diff --git a/doc/src/declarative/qtquick1.qdoc b/doc/src/declarative/qtquick1.qdoc deleted file mode 100644 index a64fc7d91d..0000000000 --- a/doc/src/declarative/qtquick1.qdoc +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \qmlmodule QtQuick 1 - \title QML Module QtQuick 1 - - \brief The QML Elements - - This QML module contains all the QML elements that are - instantiated as objects of C++ classes in the QtQuick1 - module. These elements are QGraphicsObject based, and - work with the Graphics View framework. In Qt 5, they - have been replaced by \l{QtQuick 2}, based on the - Scenegraph renderer. - */ diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc index 3121080c7a..4e67bac407 100644 --- a/doc/src/declarative/whatsnew.qdoc +++ b/doc/src/declarative/whatsnew.qdoc @@ -148,15 +148,12 @@ New elements have been added for contructing paths: PathArc, PathCurve, PathSvg. \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 +requires adding the "quick1" module to the .pro file, e.g. QT += quick1 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. - \sa {What's New in Qt Quick 1}{What's New in Qt Quick 1} */ |