feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '2.7'

Browse Source 
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
This commit is contained in:
Oswald Buddenhagen
2013-05-15 10:21:47 +02:00
parent c6bee7e20e 8ca5b55a0b
commit 6fb94a7b10
63 changed files with 883 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
doc/src/qtquick/qtquick-components.qdoc
View File

@@ -74,12 +74,16 @@
\endlist
QML types allow you to write cross-platform applications with custom look
and feel. You can also use ready-made Qt Quick Components that enable you to
create applications with a native look and feel for a particular target
platform. You can install the components as part of the Qt 4 SDK.
and feel. You can also use ready-made Qt Quick Components (for Qt 4) to
create screens with a native look and feel for a particular target platform.
Since Qt 5.1, a set of Qt Quick Controls is available for creating classic
desktop-style user interfaces using Qt Quick 2.1.
When you use the \QC project wizard to create Qt Quick applications, you
can select which component set to use in your application.
You can install Qt Quick 1 Components as part of the Qt 4 SDK and the Qt
Quick Controls as part of Qt 5.1, or later.
The \QC project wizards create Qt Quick applications that use Qt Quick
Components or Controls.
Even if you use the Qt Quick Components, you can still write cross-platform
applications, by using different sets of QML files for each platform.

10
doc/src/qtquick/qtquick-creating.qdoc
View File

@@ -64,6 +64,10 @@
need to have the development environment installed on your
computer to create and run this type of project.
\gui {Qt Quick 2 UI with Controls} imports the Qt Quick Controls.
This project requires that you have installed the Qt Quick Controls
for your Qt version (5.1 or later).
\li \gui {Qt Quick Application (from Existing QML File)} converts
existing Qt Quick applications to Qt Quick application projects.
This enables you to run them from \QC and to deploy them to mobile
@@ -80,8 +84,10 @@
\section1 Creating Qt Quick UI Projects
Select \gui File > \gui {New File or Project} > \gui Applications > \gui {Qt Quick 1 UI}
or \gui {Qt Quick 2 UI} > \gui Choose and follow the instructions of the wizard.
Select \gui File > \gui {New File or Project} > \gui Applications >
\gui {Qt Quick 1 UI}, \gui {Qt Quick 2 UI}, or
\gui {Qt Quick 2 UI with Controls} > \gui Choose and follow the instructions
of the wizard.
\QC creates the following files:

16
doc/src/qtquick/qtquick-designer.qdoc
View File

@@ -56,7 +56,8 @@
\li \gui {Library} pane (2) displays the building blocks that you can use to
design applications: predefined QML types, your own QML
components, Qt Quick components that you import to the project, and
components, Qt Quick components or Qt Quick Controls that you import
to the project, and
other resources.
\li \gui Canvas (3) is the working area where you create QML components and
@@ -150,18 +151,23 @@
components, basic types, positioner types, and views.
Sets of UI components with the look and feel of a particular mobile device
platform have been defined for Qt Quick. They are based on standard QML
types. To view the UI components in the \gui {Library} pane, add import
platform have been defined for Qt Quick 1. Since Qt 5.1, a set of Qt Quick
Controls is available for creating classic desktop-style user interfaces
using Qt Quick 2.1. The Qt Quick Components and Controls are based on
standard QML types. To view the components and controls in the
\gui {Library} pane, add import
statements to the .pro file of your project. For example:
\list
\li \c {import com.nokia.meego 1.0} for MeeGo
\li \c {import QtQuick.Controls 1.0} for Qt Quick Controls
\endlist
The Qt Quick Application wizard adds the import statements automatically
when you select the component set to use for your project.
The \gui {Qt Quick Application} wizards for a particular platform, such as
MeeGo Harmattan, and the \gui {Qt Quick 2 UI with Controls} wizard add the
import statements automatically.
\image qmldesigner-qml-components.png "QML Components pane"

9
doc/src/qtquick/qtquick-screens.qdoc
View File

@@ -40,9 +40,12 @@
in the \gui Library pane.
\endif
You can also use ready-made Qt Quick Components that allow you to create
screens with a native look and feel for a particular target platform. You
can install the components as part of the Qt 4 SDK.
You can also use ready-made Qt Quick 1 Components (for Qt 4) to create
screens with a native look and feel for a particular target platform.
Since Qt 5.1, a set of Qt Quick Controls is available for creating classic
desktop-style user interfaces using Qt Quick 2.1. You
can install Qt Quick 1 Components as part of the Qt 4 SDK and the Qt Quick
Controls as part of Qt 5.1, or later.
\if defined(qcmanual)
\section1 Adding Components to Screens