diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /doc/src/qtquick2/qtquick-intro.qdoc | |
parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'doc/src/qtquick2/qtquick-intro.qdoc')
-rw-r--r-- | doc/src/qtquick2/qtquick-intro.qdoc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/qtquick2/qtquick-intro.qdoc b/doc/src/qtquick2/qtquick-intro.qdoc index 9eebb0bddc..0fcf4ef603 100644 --- a/doc/src/qtquick2/qtquick-intro.qdoc +++ b/doc/src/qtquick2/qtquick-intro.qdoc @@ -100,23 +100,23 @@ extendibility and openness, while aiming to lower the barrier of entry for newcomers to Qt Quick and Qt. The key features of Qt Creator allow UI designers and developers to accomplish the following tasks: \list -\o Get started with Qt Quick application development quickly and easily with +\li Get started with Qt Quick application development quickly and easily with examples, tutorials, and project wizards. -\o Design application user interface with the integrated editor, Qt Quick +\li Design application user interface with the integrated editor, Qt Quick Designer, or use graphics software to design the user interface and use scripts to export the design to Qt Quick Designer. -\o Develop applications with the advanced code editor that provides new powerful +\li Develop applications with the advanced code editor that provides new powerful 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 +\li Build and deploy Qt Quick applications that target multiple desktop and mobile platforms, such as Microsoft Windows, Mac OS X, Linux, and Maemo. -\o Debug JavaScript functions and execute JavaScript expressions in the current +\li 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 +\li Deploy applications to mobile devices and create application installation 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 +\li Easily access information with the integrated context-sensitive Qt Help system. \endlist @@ -138,6 +138,6 @@ The \l {Qt Quick Code Samples} page has a gallery of QML applications. \section1 License Information \list -\o \l{Qt Quick Licensing Information} +\li \l{Qt Quick Licensing Information} \endlist */ |