Commit 7f4cbe23 authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/debugger/moduleshandler.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
parents 6f322898 552a0728
......@@ -54,6 +54,10 @@
\o \l{Finding and Replacing}
\o \l{Refactoring}
\o \l{Searching With the Locator}
\o \l{Pasting and Fetching Code Snippets}
\o \l{Configuring the Editor}
\o \l{Using FakeVim Mode}
\o \l{Using an External Editor}
\endlist
\o \l{Managing Projects}
\list
......@@ -388,6 +392,9 @@
\endlist
Output panes are available in all \l{Qt Creator modes}{modes}.
Click the name of an output pane to open the pane. To maximize
an open output pane, click the \gui {Maximize Output Pane} button
or press \key {Alt+9}.
\section2 Build Issues
......@@ -620,28 +627,6 @@
checking, code completion, context sensitive help and in-line error
indicators while you are typing.
\section1 Configuring the Editor
Qt Creator allows you to configure the text editor to suit your specific
needs. To configure the editor, select \gui Tools > \gui{Options...} >
\gui{Text Editor}
You can perform the following configuration actions:
\list
\o Set the font preferences and apply syntax highlighting in
\gui{Font & Colors}.
\o Set tabs, indentation, the handling of whitespace, and mouse operations in
\gui Behavior.
\o Set various display properties, for example,
\l{Highlighting and folding blocks}{highlighting and folding blocks},
text wrapping or \l{Moving to symbol definition or declaration}
{moving to symbol definition or declaration}
in \gui Display.
\o Configure \l{Completing Code}{code completion} in \gui Completion.
\endlist
\section1 Using the Editor Toolbar
The editor toolbar is located at the top of the editor view. The editor
......@@ -716,6 +701,11 @@
\gui{Text Editor} > \gui Display > \gui{Display folding markers}. This
option is enabled by default.
When the cursor is on a brace, the matching brace is animated
by default. To turn off the animation and just highlight the block and
the braces, select \gui {Tools > Options... > Text Editor > Display} and
deselect \gui {Animate matching parentheses}.
\section1 Checking Code Syntax
......@@ -760,6 +750,10 @@
\gui{Autocomplete common prefix} in the code completion preferences.
Select \gui Tools > \gui{Options...} > \gui{Text Editor} > \gui Completion.
By default, code completion considers only the first letter case-sensitive.
To apply full or no case-sensitivity, select the option in the
\gui {Case-sensitivity} field.
The following table lists available types for code completion and icon
used for each.
......@@ -856,8 +850,16 @@
\note In Qt Creator indexing updates the code automatically. Use
\gui{Update code model} only as an emergency command.
*/
/*!
\contentspage index.html
\previouspage creator-editor-locator.html
\page creator-editor-codepasting.html
\nextpage creator-editor-options.html
\section1 Pasting and Fetching Code Snippets
\title Pasting and Fetching Code Snippets
In Qt Creator, you can paste snippets of code to a server or fetch
snippets of code from the server. To paste and fetch snippets of code,
......@@ -890,7 +892,16 @@
If they have the project currently opened in Qt Creator, they can apply and test
the change by choosing \gui{Tools} > \gui{Git} > \gui{Apply Patch}.
\section1 Using FakeVim Mode
*/
/*!
\contentspage index.html
\previouspage creator-editor-options.html
\page creator-editor-fakevim.html
\nextpage creator-editor-external.html
\title Using FakeVim Mode
In the \gui{FakeVim} mode, you can run the main editor in a manner similar
to the Vim editor. To run the editor in the \gui{FakeVim} mode, select
......@@ -906,14 +917,26 @@
Qt Creator core, select \gui{Tools} > \gui{Options...} > \gui{FakeVim} >
\gui{Ex Command Mapping}.
To make changes to the Vim style settings, select \gui{Tools} >
\gui{Options...} > \gui{General}.
To make changes to the Vim-style settings, select \gui{Tools} >
\gui{Options...} > \gui FakeVim > \gui{General}.
To use a Vim-style color scheme, select \gui {Tools > Options... >
Text Editor > Fonts & Color}. In the \gui {Color Scheme} list, select
\gui {Vim (dark)}.
To quit the FakeVim mode, click \gui {Quit FakeVim} or press
\key{Alt+V,Alt+V}.
*/
/*!
\contentspage index.html
\previouspage creator-editor-fakevim.html
\page creator-editor-external.html
\nextpage creator-project-managing.html
\section1 Using an External Editor
\title Using an External Editor
To open the file you are currently viewing in an external editor, select
\gui Edit > \gui Advanced > \gui{Open in External Editor}.
......@@ -947,6 +970,134 @@
*/
/*!
\contentspage index.html
\previouspage creator-editor-codepasting.html
\page creator-editor-options.html
\nextpage creator-editor-fakevim.html
\title Configuring the Editor
Qt Creator allows you to configure the text editor to suit your specific
needs. To configure the editor, select \gui Tools > \gui{Options...} >
\gui{Text Editor}.
You can perform the following configuration actions:
\list
\o Set the font preferences and apply syntax highlighting in
\gui{Font & Colors}.
\o Set tabs, indentation, the handling of whitespace, and mouse operations in
\gui Behavior.
\o Set various display properties, for example,
\l{Highlighting and folding blocks}{highlighting and folding blocks},
text wrapping or \l{Moving to symbol definition or declaration}
{moving to symbol definition or declaration}
in \gui Display.
\o Configure \l{Completing Code}{code completion} in \gui Completion.
\endlist
\section2 Configuring Fonts
You can select the font family and size. You can specify a zoom setting in
percentage for viewing the text. You can also zoom in or out by pressing
\key {Ctrl++} or \key {Ctrl +-}, or by pressing \key Ctrl and rolling
the mouse button up or down. To disable the mouse wheel function, select
\gui {Tools > Options... > Text Editor > Behavior} and deselect the
\gui {Enable scroll wheel zooming} check box.
Antialiasing is used by default to make text look smoother and more
readable on the screen. Deselect the \gui Antialias check box to
turn off antialiasing.
\section2 Defining Color Schemes
You can select one of the predefined color schemes for syntax highlighting
or create customized color schemes. To create a color scheme:
\list 1
\o Select \gui {Tools > Options... > Text Editor > Fonts & Color > Copy}.
\o Enter a name for the color scheme and click \gui OK.
\o In the \gui Foreground field, specify the color of the selected
code element.
\o In the \gui Background field, select the background
color for the code element.
The backgound of the \gui Text element determines the background of the
code editor.
\endlist
When you copy code from Qt Creator, it is copied in both plain text and HTML
format. The latter makes sure that syntax highlighting is preserved when
pasting to a rich-text editor.
\section2 Indenting Code
When you type code, it is indented automatically according to the selected
options. Select a block to indent it when you press \key Tab.
Press \key {Shift+Tab} to decrease the indentation.
When you press \gui Backspace the indentation is decreased by one level,
instead of one space, by default.
By default, the tab-length in code editor is 8 spaces, but you can change
it. The code editor can also determine whether tabs or spaces are used
on the previous or next line and copy the style.
You can determine whether the block indent style includes braces,
or you can use the GNU indent style. The GNU style places braces on a separate
line, indented by 2 spaces, except when they open a function definition, where
they are not indented.
The following code snippet illustrates excluding braces from the indented block:
\code
void foobar(bool zoo)
{
if (zoo)
{
foo();
}
}
\endcode
The following code snippet illustrates including braces in the indented block:
\code
void foobar(bool zoo)
{
if (zoo)
{
foo();
}
}
\endcode
The following code snippet illustrates the GNU style:
\code
void foobar(bool zoo)
{
if (zoo)
{
foo();
}
}
\endcode
*/
/*!
\contentspage index.html
\previouspage creator-editor-using.html
......@@ -1139,7 +1290,7 @@
/*!
\contentspage index.html
\previouspage creator-editor-locator.html
\previouspage creator-editor-external.html
\page creator-project-managing.html
\nextpage creator-project-creating.html
......@@ -1702,7 +1853,7 @@
/*!
\contentspage index.html
\previouspage creator-developing-symbian.html
\previouspage creator-project-managing-sessions.html
\page creator-building-running.html
\nextpage creator-building-targets.html
......@@ -1941,6 +2092,24 @@
For more information on how to define capabilities for a project, see
\l{http://doc.qt.nokia.com/4.7-snapshot/qmake-platform-notes.html#capabilities}{Capabilities}.
\section3 Application UID
A UID is a globally unique identifier that is used to
uniquely identify, for example, an object or file type. In Symbian development,
objects are identified by compound identifiers that are constructed from three
UIDs, namely UID1, UID2, and UID3. UID1 and UID2 specify the category of an
object, whereas UID3 identifies a particular object, such as an application.
When you create a \gui {Mobile Qt Application}, Qt Creator adds a UID3 suitable for
development and debugging automatically to the application .pro file. However, to
distribute your application and get it Symbian signed, you must apply for a UID
from Symbian, who manages the allocation of UIDs. You can request UIDs either one
at a time or as preallocated blocks on the \l{https://www.symbiansigned.com/app/page}{Symbian Signed}
web site.
Replace the testing UID with the distribution UID in the .pro file before you
build the final installation package. For more information, see
\l{http://doc.qt.nokia.com/4.7-snapshot/qmake-platform-notes.html#unique-identifiers}{Unique Identifiers}.
\section2 Building and Running for Symbian Emulator
......@@ -2145,7 +2314,7 @@
\contentspage index.html
\previouspage creator-editor-settings.html
\page creator-build-dependencies.html
\nextpage creator-project-managing-sessions.html
\nextpage creator-visual-editor.html
\title Specifying Dependencies
......@@ -2890,7 +3059,7 @@
\contentspage index.html
\previouspage creator-editor-refactoring.html
\page creator-editor-locator.html
\nextpage creator-project-managing.html
\nextpage creator-editor-codepasting.html
\title Searching With the Locator
......@@ -3064,9 +3233,9 @@
/*!
\contentspage index.html
\previouspage creator-build-dependencies.html
\previouspage creator-developing-symbian.html
\page creator-project-managing-sessions.html
\nextpage creator-visual-editor.html
\nextpage creator-building-running.html
\title Managing Sessions
......@@ -4497,7 +4666,7 @@
/*!
\contentspage index.html
\previouspage creator-project-managing-sessions.html
\previouspage creator-build-dependencies.html
\page creator-visual-editor.html
\nextpage creator-usability.html
......@@ -5527,7 +5696,7 @@
\contentspage index.html
\previouspage creator-developing-maemo.html
\page creator-developing-symbian.html
\nextpage creator-building-running.html
\nextpage creator-project-managing-sessions.html
\title Setting Up Development Environment for Symbian
......@@ -6052,6 +6221,9 @@
\row
\o Cut line
\o Shift+Del
\row
\o Join lines
\o Ctrl+J
\row
\o Decrease font size
\o Ctrl+- (Ctrl+Roll mouse wheel down)
......@@ -6059,7 +6231,7 @@
\o Increase font size
\o Ctrl++ (Ctrl+Roll mouse wheel up)
\row
\o Toggle vim-style editing
\o Toggle Vim-style editing
\o Alt+V, Alt+V
\row
\o Split
......
......@@ -1370,12 +1370,12 @@
<type name="Qt.AnchorAnimation" version="4.7" extends="Qt.Animation">
<property name="targets" type="Qt.Item" isList="true"/>
<property name="duration" type="int"/>
<property name="easing" type="QEasingCurve"/>
<property name="easing" type="Qt.Easing"/>
<signal name="durationChanged">
<param type="int"/>
</signal>
<signal name="easingChanged">
<param type="QEasingCurve"/>
<param type="Qt.Easing"/>
</signal>
</type>
<type name="Qt.AnchorChanges" version="4.7" extends="QDeclarativeStateOperation">
......@@ -1457,10 +1457,6 @@
<enumerator name="Loading" value="2"/>
<enumerator name="Error" value="3"/>
</enum>
<property name="isNull" type="bool"/>
<property name="isReady" type="bool"/>
<property name="isError" type="bool"/>
<property name="isLoading" type="bool"/>
<property name="progress" type="qreal"/>
<property name="status" type="Status"/>
<property name="url" type="QUrl"/>
......@@ -1474,6 +1470,7 @@
</type>
<type name="Qt.Connections" version="4.7" extends="Qt.QtObject">
<property name="target" type="Qt.QtObject"/>
<property name="ignoreUnknownSignals" type="bool"/>
<signal name="targetChanged"/>
</type>
<type name="Qt.DoubleValidator" version="4.7" extends="QValidator">
......@@ -1555,7 +1552,7 @@
<enumerator name="SineCurve" value="43"/>
<enumerator name="CosineCurve" value="44"/>
</enum>
<property name="type" type="QDeclarativeEasingValueType.Type"/>
<property name="type" type="Type"/>
<property name="amplitude" type="qreal"/>
<property name="overshoot" type="qreal"/>
<property name="period" type="qreal"/>
......@@ -1566,7 +1563,7 @@
<enumerator name="DragOverBounds" value="1"/>
<enumerator name="DragAndOvershootBounds" value="2"/>
</enum>
<enum name="FlickDirection">
<enum name="FlickableDirection">
<enumerator name="AutoFlickDirection" value="0"/>
<enumerator name="HorizontalFlick" value="1"/>
<enumerator name="VerticalFlick" value="2"/>
......@@ -1583,8 +1580,13 @@
<property name="maximumFlickVelocity" type="qreal"/>
<property name="flickDeceleration" type="qreal"/>
<property name="moving" type="bool"/>
<property name="movingHorizontally" type="bool"/>
<property name="movingVertically" type="bool"/>
<property name="flicking" type="bool"/>
<property name="flickDirection" type="FlickDirection"/>
<property name="flickingHorizontally" type="bool"/>
<property name="flickingVertically" type="bool"/>
<property name="flickDirection" type="FlickableDirection"/>
<property name="flickableDirection" type="FlickableDirection"/>
<property name="interactive" type="bool"/>
<property name="pressDelay" type="int"/>
<property name="atXEnd" type="bool"/>
......@@ -1599,22 +1601,26 @@
<signal name="contentXChanged"/>
<signal name="contentYChanged"/>
<signal name="movingChanged"/>
<signal name="movingHorizontallyChanged"/>
<signal name="movingVerticallyChanged"/>
<signal name="flickingChanged"/>
<signal name="movementStarted"/>
<signal name="movementEnded"/>
<signal name="flickStarted"/>
<signal name="flickEnded"/>
<signal name="flickingHorizontallyChanged"/>
<signal name="flickingVerticallyChanged"/>
<signal name="horizontalVelocityChanged"/>
<signal name="verticalVelocityChanged"/>
<signal name="isAtBoundaryChanged"/>
<signal name="pageChanged"/>
<signal name="flickDirectionChanged"/>
<signal name="flickableDirectionChanged"/>
<signal name="interactiveChanged"/>
<signal name="overShootChanged"/>
<signal name="boundsBehaviorChanged"/>
<signal name="maximumFlickVelocityChanged"/>
<signal name="flickDecelerationChanged"/>
<signal name="pressDelayChanged"/>
<signal name="movementStarted"/>
<signal name="movementEnded"/>
<signal name="flickStarted"/>
<signal name="flickEnded"/>
</type>
<type name="Qt.Flipable" version="4.7" defaultProperty="data" extends="Qt.Item">
<enum name="Side">
......@@ -1865,18 +1871,30 @@
<method name="forceFocus"/>
</type>
<type name="Qt.KeyNavigation" version="4.7" extends="Qt.QtObject">
<enum name="Priority">
<enumerator name="BeforeItem" value="0"/>
<enumerator name="AfterItem" value="1"/>
</enum>
<property name="left" type="Qt.Item"/>
<property name="right" type="Qt.Item"/>
<property name="up" type="Qt.Item"/>
<property name="down" type="Qt.Item"/>
<property name="tab" type="Qt.Item"/>
<property name="backtab" type="Qt.Item"/>
<property name="priority" type="Priority"/>
<signal name="changed"/>
<signal name="priorityChanged"/>
</type>
<type name="Qt.Keys" version="4.7" extends="Qt.QtObject">
<enum name="Priority">
<enumerator name="BeforeItem" value="0"/>
<enumerator name="AfterItem" value="1"/>
</enum>
<property name="enabled" type="bool"/>
<property name="forwardTo" type="Qt.Item" isList="true"/>
<property name="priority" type="Priority"/>
<signal name="enabledChanged"/>
<signal name="priorityChanged"/>
<signal name="pressed">
<param name="event" type="QDeclarativeKeyEvent"/>
</signal>
......@@ -2126,14 +2144,8 @@
<enumerator name="Loading" value="2"/>
<enumerator name="Error" value="3"/>
</enum>
<enum name="ResizeMode">
<enumerator name="NoResize" value="0"/>
<enumerator name="SizeLoaderToItem" value="1"/>
<enumerator name="SizeItemToLoader" value="2"/>
</enum>
<property name="source" type="QUrl"/>
<property name="sourceComponent" type="Qt.Component"/>
<property name="resizeMode" type="ResizeMode"/>
<property name="item" type="QGraphicsObject"/>
<property name="status" type="Status"/>
<property name="progress" type="qreal"/>
......@@ -2141,7 +2153,7 @@
<signal name="sourceChanged"/>
<signal name="statusChanged"/>
<signal name="progressChanged"/>
<signal name="resizeModeChanged"/>
<signal name="loaded"/>
</type>
<type name="Qt.MouseArea" version="4.7" defaultProperty="data" extends="Qt.Item">
<property name="mouseX" type="qreal"/>
......@@ -2157,6 +2169,7 @@
<signal name="pressedChanged"/>
<signal name="enabledChanged"/>
<signal name="acceptedButtonsChanged"/>
<signal name="hoverEnabledChanged"/>
<signal name="positionChanged">
<param name="mouse" type="QDeclarativeMouseEvent"/>
</signal>
......@@ -2180,6 +2193,7 @@
</signal>
<signal name="entered"/>
<signal name="exited"/>
<signal name="canceled"/>
</type>
<type name="Qt.NumberAnimation" version="4.7" extends="Qt.PropertyAnimation">
<property name="from" type="qreal"/>
......@@ -2274,6 +2288,8 @@
<signal name="highlightChanged"/>
<signal name="highlightItemChanged"/>
<signal name="highlightMoveDurationChanged"/>
<method name="incrementCurrentIndex"/>
<method name="decrementCurrentIndex"/>
</type>
<type name="Qt.PauseAnimation" version="4.7" extends="Qt.Animation">
<property name="duration" type="int"/>
......@@ -2303,7 +2319,7 @@
<property name="duration" type="int"/>
<property name="from" type="QVariant"/>
<property name="to" type="QVariant"/>
<property name="easing" type="QEasingCurve"/>
<property name="easing" type="Qt.Easing"/>
<property name="target" type="Qt.QtObject"/>
<property name="property" type="string"/>
<property name="properties" type="string"/>
......@@ -2319,7 +2335,7 @@
<param type="QVariant"/>
</signal>
<signal name="easingChanged">
<param type="QEasingCurve"/>
<param type="Qt.Easing"/>
</signal>
<signal name="propertiesChanged">
<param type="string"/>
......@@ -3094,7 +3110,7 @@
<property name="contentsMargin" type="qreal"/>
</type>
<type name="Qt.widgets.QGraphicsLinearLayoutStretchItem" version="4.7" extends="Qt.QtObject"/>
<type name="org.webkit.WebView" version="1.0" defaultProperty="data" extends="QDeclarativePaintedItem">
<type name="org.webkit.WebView" version="1.0" defaultProperty="data" extends="Qt.Item">
<enum name="Status">
<enumerator name="Null" value="0"/>
<enumerator name="Ready" value="1"/>
......@@ -3121,6 +3137,8 @@
<property name="newWindowComponent" type="Qt.Component"/>
<property name="newWindowParent" type="Qt.Item"/>
<property name="renderingEnabled" type="bool"/>
<property name="contentsSize" type="QSize"/>
<property name="contentsScale" type="qreal"/>
<signal name="preferredWidthChanged"/>
<signal name="preferredHeightChanged"/>
<signal name="urlChanged"/>
......@@ -3139,6 +3157,10 @@
<signal name="newWindowComponentChanged"/>
<signal name="newWindowParentChanged"/>
<signal name="renderingEnabledChanged"/>
<signal name="contentsSizeChanged">
<param type="QSize"/>
</signal>
<signal name="contentsScaleChanged"/>
<signal name="loadStarted"/>
<signal name="loadFinished"/>
<signal name="loadFailed"/>
......