Commit 2d03b59f authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/3.3'

Change-Id: I0ab4982e229d475b8e3575414b4bebbfea07498d
parents dfae7365 e3419dc5
......@@ -457,7 +457,7 @@
\li To continue running the program, press \key{F5}.
\li To run to the line containing the cursor, press \ke{yCtrl+F10}
\li To run to the line containing the cursor, press \key{Ctrl+F10}
(\key{Shift+F8} on OS X).
\li To run to the selected function when you are stepping into a nested
......
......@@ -94,11 +94,6 @@
You can change the configuration of preconfigured tools and configure
additional tools in \QC \gui Options.
You can use \QC variables in the fields that you can select from
lists of available \QC variables (1).
\image qtcreator-external-tools.png "External Tools options"
To configure external tools:
\list 1
......
......@@ -612,7 +612,7 @@
\li Alt+Z, Alt+C
\li Alt+C, Alt+C
\li Alt+G, Alt+C
\li Alt+H, Alt+C
\li Alt+G, Alt+C
\li Alt+P, Alt+S
\li Alt+S, Alt+C
\row
......@@ -620,7 +620,7 @@
\li Alt+Z, Alt+D
\li Alt+C, Alt+D
\li Alt+G, Alt+D
\li Alt+H, Alt+D
\li Alt+G, Alt+D
\li
\li Alt+S, Alt+D
\row
......@@ -644,7 +644,7 @@
\li Alt+Z, Alt+L
\li
\li Alt+G, Alt+L
\li Alt+H, Alt+L
\li Alt+G, Alt+L
\li Alt+P, Alt+F
\li
\row
......@@ -660,7 +660,7 @@
\li Alt+Z, Alt+S
\li
\li
\li Alt+H, Alt+S
\li Alt+G, Alt+S
\li
\li
\row
......
......@@ -96,17 +96,10 @@
You can use \QC variables in arguments, executable paths, and working
directories. The variables take care of quoting their expansions, so you do
not need to put them in quotes.
The following \QC variables are available:
\list
\li %{buildDir}
\li %{sourceDir}
\endlist
not need to put them in quotes. Select the
\inlineimage qtcreator-variables-button.png
(\gui {Variables}) button in a field to select from a list of variables that
are available in a particular context.
\section1 Build Steps
......
......@@ -31,7 +31,7 @@
\title Qt Quick UI Forms
You can use \QC wizards to create UI forms tha have the filename extension
You can use \QC wizards to create UI forms that have the filename extension
\e .ui.qml. The UI forms contain a purely declarative subset of the QML
language. It is recommended that you edit the forms in the \gui Design mode.
\QC enforces the use of the supported QML features by displaying error
......
import qbs
import qbs.FileInfo
import QtcProduct
QtcProduct {
type: "application"
......
import qbs 1.0
import QtcFunctions
import QtcProduct
QtcProduct {
type: "dynamiclibrary"
......
import qbs 1.0
import qbs.FileInfo
import QtcFunctions
import QtcProduct
QtcProduct {
type: ["dynamiclibrary", "pluginSpec"]
......
import qbs 1.0
import QtcProduct
QtcProduct {
type: "application" // no Mac app bundle
......
......@@ -1582,14 +1582,20 @@ def qdump__QRegion(d, value):
ns = d.qtNamespace()
rectType = d.lookupType(ns + "QRect")
d.putIntItem("numRects", n)
d.putSubItem("extents", d.createValue(pp + 2 * v, rectType))
d.putSubItem("innerRect", d.createValue(pp + 2 * v + rectType.sizeof, rectType))
d.putIntItem("innerArea", d.extractInt(pp + 2 * v + 2 * rectType.sizeof))
if d.qtVersion() >= 0x050400:
# Changed in ee324e4ed
d.putSubItem("extents", d.createValue(pp + 8 + v, rectType))
d.putSubItem("innerRect", d.createValue(pp + 8 + v + rectType.sizeof, rectType))
d.putIntItem("innerArea", d.extractInt(pp + 4))
else:
d.putSubItem("extents", d.createValue(pp + 2 * v, rectType))
d.putSubItem("innerRect", d.createValue(pp + 2 * v + rectType.sizeof, rectType))
d.putIntItem("innerArea", d.extractInt(pp + 2 * v + 2 * rectType.sizeof))
# FIXME
try:
# Can fail if QVector<QRect> debuginfo is missing.
vectType = d.lookupType("%sQVector<%sQRect>" % (ns, ns))
d.putSubItem("rects", d.createValue(pp + v, vectType))
d.putSubItem("rects", d.createValue(pp + 8, vectType))
except:
with SubItem(d, "rects"):
d.putItemCount(n)
......
Label {
text: "%1"
toolTip: "%1"
tooltip: "%1"
}
SpinBox {
maximumValue: 9999999
......
Label {
text: "%1"
toolTip: "%1"
tooltip: "%1"
}
SpinBox {
maximumValue: 9999999
......
Label {
text: "%1"
toolTip: "%1"
tooltip: "%1"
}
LineEdit {
backendValue: backendValues.%2
......
Label {
text: "%1"
toolTip: "%1"
tooltip: "%1"
}
LineEdit {
backendValue: backendValues.%2
......
......@@ -50,7 +50,7 @@ Column {
ComboBox {
model: ["LeftToRight", "TopToBottom"]
backendValue: backendValues.flow
scope: "Qt"
scope: "Flow"
}
ExpandingSpacer {
......
......@@ -85,7 +85,7 @@ Column {
model: ["LeftToRight", "TopToBottom"]
backendValue: backendValues.flow
Layout.fillWidth: true
scope: "Qt"
scope: "Grid"
}
}
......
......@@ -45,6 +45,11 @@
"source": "file.pro",
"target": "%{ProFileName}",
"openAsProject": true
},
{
"source": "../git.ignore",
"target": "%{ProjectDirectory}/.gitignore",
"condition": "%{JS: ('%{VersionControl}%{IsSubproject}' === 'G.Git') ? 'yes' : ''}"
}
]
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment