diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
| commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
| tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /doc/src/qtquick1/qtquick-intro.qdoc | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'doc/src/qtquick1/qtquick-intro.qdoc')
| -rw-r--r-- | doc/src/qtquick1/qtquick-intro.qdoc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/src/qtquick1/qtquick-intro.qdoc b/doc/src/qtquick1/qtquick-intro.qdoc index 54a5f29573..7924b1a651 100644 --- a/doc/src/qtquick1/qtquick-intro.qdoc +++ b/doc/src/qtquick1/qtquick-intro.qdoc @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -94,13 +94,12 @@ to export the design to Qt Quick Designer. features for completing code snippets, refactoring code, and viewing the element hierarchy of QML files. \o Build and deploy Qt Quick applications that target multiple desktop and -mobile platforms, such as Microsoft Windows, Mac OS X, Linux, Symbian, and -Maemo. +mobile platforms, such as Microsoft Windows, Mac OS X, Linux, and Maemo. \o Debug JavaScript functions and execute JavaScript expressions in the current context, and inspect QML at runtime to explore the object structure, debug animations, and inspect colors. \o Deploy applications to mobile devices and create application installation -packages for Symbian and Maemo devices that can be published in the Ovi Store +packages for Maemo devices that can be published in the Ovi Store and other channels. \o Easily access information with the integrated context-sensitive Qt Help system. |