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

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
This commit is contained in:
Eike Ziller
2015-01-08 10:38:20 +01:00
parent 0a5186700c ecd9c4c813
commit b5b47f7df2
72 changed files with 4939 additions and 3784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/qtquick/qtquick-app-tutorial.qdoc
View File

@@ -102,7 +102,7 @@
\li Click \uicontrol Design to open the file in \QMLD.
\image qmldesigner-tutorial-desing-mode.png "Transitions project in Design Mode"
\image qmldesigner-tutorial-design-mode.png "Transitions project in Design Mode"
\li In the \uicontrol Navigator, select \uicontrol Text and press \key Delete to
delete it.

2
doc/src/qtquick/qtquick-connection-editor.qdoc
View File

@@ -49,7 +49,7 @@
\section1 Connecting Objects to Signals
To connect objects to signals in QML, create \l{Connection} objects.
To connect objects to signals in QML, create \l{Connections} objects.
\image qmldesigner-connections.png

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

@@ -32,7 +32,7 @@
You can edit \l{Qt Quick UI Forms} (ui.qml files) in \QMLD. \QC opens the
UI forms in the \uicontrol Design mode. It is recommended that you use UI forms
for components that you want to desing in \QMLD.
for components that you want to design in \QMLD.
\image qmldesigner-visual-editor.png "Visual editor"
@@ -125,8 +125,8 @@
\section2 Setting the Stacking Order
The \l{Item#z-prop}{z property} of an
item determines its position in relation to its sibling items in the
The \c z property of an \l Item determines its position in relation to its
sibling items in the
type hierarchy. By default, items with a higher stacking value are
drawn on top of siblings with a lower stacking value. Items with the same
stacking value are drawn in the order they are listed, from the last item

3
doc/src/qtquick/qtquick-modules-with-plugins.qdoc
View File

@@ -36,7 +36,8 @@
information for code completion and the semantic checks to work correctly.
When you write a QML module or use QML from a C++ application you typically
register new types with \l{QQmlEngine#qmlRegisterType-3}{qmlRegisterType()} or expose some
register new types with the \l{QQmlEngine} class \c qmlRegisterType()
function or expose some
class instances with \l{QQmlContext::setContextProperty()}. The \QC C++
code model now scans for these calls and
tells the QML code model about them. This means that properties are