Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove QtQuick1 elements from qtdeclarative
QtQuick1 is now contained in a separate repository.

Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
  • Loading branch information
Matthew Vogt authored and Qt by Nokia committed Feb 2, 2012
1 parent 5e07b57 commit 01dc7e2
Show file tree
Hide file tree
Showing 1,736 changed files with 199 additions and 167,760 deletions.
3 changes: 0 additions & 3 deletions doc/config/qtquick.qdocconf
Expand Up @@ -21,9 +21,6 @@ imagedirs += ../src/images \
sourcedirs += ../src \
../../src

excludedirs += ../src/qtquick1 \
../../src/qtquick1

#indexes = $QT5DOC/doc/html/qt.index

# The following parameters are for creating a qhp file, the qhelpgenerator
Expand Down
17 changes: 0 additions & 17 deletions doc/src/declarative/qmltest.qdoc
Expand Up @@ -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
*/
40 changes: 0 additions & 40 deletions doc/src/declarative/qtquick1.qdoc

This file was deleted.

5 changes: 1 addition & 4 deletions doc/src/declarative/whatsnew.qdoc
Expand Up @@ -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}

*/

0 comments on commit 01dc7e2

Please sign in to comment.