Commit f3a61e8b authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/3.2'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
parents 59b34b6b b2ac3fd9
......@@ -137,7 +137,6 @@ tmp/
/tests/manual/qml-ast2dot/qml-ast2dot
/tests/manual/debugger/simple/libsimple_test_plugin.*dylib
/tests/manual/debugger/simple/simple_test_app
/tests/manual/plain-cplusplus/plain-c++
/tests/manual/preprocessor/pp
/tests/tools/cplusplus-ast2png/cplusplus-ast2png
/tests/auto/aggregation/tst_aggregation
......
......@@ -21,8 +21,11 @@ General
* Made keyboard and mouse activation of navigation panes and other trees more consistent
* Removed unhelpful Generic Highlighter loading progress bar
* Fixed case-sensitivity of file system locator filter (QTCREATORBUG-10843)
* Fixed that Window > Minimize, Zoom and Full Screen were always affecting the main window
instead of the active window
Editing
* Added support for manually editing bookmark line number (QTCREATORBUG-9721)
* Made Ctrl+Up and Ctrl+Down shortcuts configurable (QTCREATORBUG-4994)
* Made editor popup (Ctrl+Tab) adapt its size to contents (QTCREATORBUG-10618)
* Improved block editing (QTCREATORBUG-7773)
......@@ -39,6 +42,8 @@ Editing
* Fixed Open With when file is open in multiple splits
* Fixed that search highlights were removed when switching editors
(QTCREATORBUG-9949)
* Fixed dropping files in the presence of splits or external windows
(QTCREATORBUG-9023)
Help
* Added page up and page down shortcuts to topic chooser
......@@ -70,6 +75,9 @@ QMake Projects
with Qt 5.2 and later where this is supported (QTCREATORBUG-10024)
* Fixed that adding files to .pri file was missing $$PWD
CMake Projects
* Fixed that .cmake files were opened as projects (QTCREATORBUG-12461)
Qbs Projects
* Added support for adding and removing files from projects
* Fixed that run configurations were created for products that are not runnable
......@@ -124,6 +132,7 @@ QML Profiler
* Fixed drawing issues (QTBUG-38222)
* Fixed that clicking visible event was sometimes moving timeline
(QTCREATORBUG-11945)
* Fixed navigation through events (QTCREATORBUG-12634)
Analyzer
* Added support for Run in Terminal (QTCREATORBUG-7311)
......@@ -197,6 +206,7 @@ Beautifier
* Added support for formatting a file asynchronously
* Added support for redirecting text to a formatter tool
instead of using temporary files
* Fixed that running formatting tool was blocking UI
Platform Specific
......@@ -209,6 +219,7 @@ OS X
* Fixed activation of items with Enter in Bookmarks pane
Android
* Removed upper limit of version code in manifest editor (QTCREATORBUG-12668)
* Fixed that UI was unresponsive while creating AVD (QTCREATORBUG-10601)
Remote Linux
......
doc/images/qtcreator-kit-selector.png

23.8 KB | W: | H:

doc/images/qtcreator-kit-selector.png

38.2 KB | W: | H:

doc/images/qtcreator-kit-selector.png
doc/images/qtcreator-kit-selector.png
doc/images/qtcreator-kit-selector.png
doc/images/qtcreator-kit-selector.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -38,10 +38,8 @@
\image qtcreator-analyze-menu.png "Analyze mode menu"
By default, the views in the \gui Analyze mode are locked into place in the
workspace. Select \gui {Window > Views > Locked} to unlock the views. Drag
and drop the views into new positions on the screen. Drag view borders to
resize the views. The size and position of views are saved for future
You can drag and drop the views in the \gui Analyze mode to new positions
on the screen. The size and position of views are saved for future
sessions. Select \gui {Window > Views > Reset to Default Layout} to reset
the views to their original sizes and positions.
......
......@@ -46,9 +46,7 @@
\li In the \gui Projects mode, select a debug build configuration.
\li Select \gui Analyze to open the \gui Analyze mode.
\li Select \gui {Analyze Memory} on the toolbar.
\li Select \gui Analyze > \gui {Valgrind Memory Analyzer}.
\li Select the
\inlineimage qtcreator-analyze-start-button.png "Start button"
......@@ -156,9 +154,7 @@
\li In the \gui Projects mode, select a release build configuration.
\li Select \gui Analyze to open the \gui Analyze mode.
\li Select \gui Profile on the toolbar.
\li Select \gui Analyze > \gui {Valgrind Function Profiler}.
\li Select the
\inlineimage qtcreator-analyze-start-button.png "Start button"
......
......@@ -190,7 +190,7 @@
information, see the Android documentation.
In addition, debugging is supported at android-10 API level, or higher. In
the run settings for the project, in the \gui {Android target SDK} field,
the run settings for the project, in the \gui {Android build SDK} field,
select android-10, or higher. For more information about Android API levels,
see \l{http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels}
{What is API Level?}.
......
......@@ -146,7 +146,7 @@
\section3 Selecting API Level
In the \gui {Android target SDK} field, you can select the API level to use
In the \gui {Android build SDK} field, you can select the API level to use
for building the application. Usually, you should select the newest API
level available.
......@@ -235,6 +235,9 @@
install the application. Android OS then grants the application access to
the appropriate data and features.
To add permissions, select \gui Add and select permissions from the list.
Select the \gui {Include default permissions and features for Qt modules}
check box to add the permissions needed by Qt libraries.
To add permissions, select them in the list, and then select \gui Add.
*/
......@@ -412,10 +412,8 @@
\image qtcreator-debugger-views.png "Debug mode views"
By default, the views are locked into place in the workspace. Select
\gui {Window > Views > Locked} to unlock the views. Drag and drop the
views into new positions on the screen. Drag view borders to resize the
views. The size and position of views are saved for future sessions. Select
You can drag and drop the views in \QD to new positions on the screen.
The size and position of views are saved for future sessions. Select
\gui {Window > Views > Reset to Default Layout} to reset the views to
their original sizes and positions.
......@@ -894,8 +892,8 @@
Debugging helpers are always automatically used. To force a plain
C-like display of structures, select \gui Tools > \gui Options >
\gui Debugger > \gui {Locals & Expressions}, and then select the
\gui{Force Raw Structure Display} check box. For GDB
\gui Debugger > \gui {Locals & Expressions}, and then deselect the
\gui{Use Debugging Helper} check box. For GDB
and LLDB this will still use the Python scripts, but generate
more basic output. To force plain display for a single object
or for all objects of a given type, select the corresponding
......@@ -1218,7 +1216,7 @@
\li Make sure the debugger is set up properly. For more information,
see \l{Setting Up Debugger}.
\li In the \gui Debug mode, select \gui {Windows > Views > Debugger
\li In the \gui Debug mode, select \gui {Window > Views > Debugger
Log} to open the \gui {Debugger Log} view. Browse the contents of
the pane on the right hand side to find out what went wrong.
Always attach the contents of the pane to debugger-related
......
......@@ -142,12 +142,12 @@
\section1 Moving to Symbol Definition or Declaration
You can move directly to the definition or the declaration of a symbol by
holding the \key Ctrl and clicking the symbol. If you have multiple splits
holding the \key Ctrl key and clicking the symbol. If you have multiple splits
opened, you can open the link in the next split by holding \key Ctrl and
\key Alt while clicking on the symbol.
\key Alt while clicking the symbol.
To enable this moving function, in \gui Tools > \gui{Options} >
\gui{Text Editor} > \gui Behavior, select \gui{Enable mouse navigation}.
To enable this moving function, select \gui Tools > \gui{Options} >
\gui{Text Editor} > \gui Behavior > \gui{Enable mouse navigation}.
You can also select the symbol and press \key F2, or right-click the symbol
and select \gui {Follow Symbol Under Cursor} to move to its definition or
......
......@@ -42,7 +42,7 @@
between the filename and line number. You can also use a space between the
separator and the line number.
For example:
For example, on Windows:
\list
......@@ -54,6 +54,14 @@
\endlist
On OS X:
\list
\li \c {Qt Creator.app/Contents/MacOS/Qt Creator -help}
\endlist
To open a project that is located in a particular folder, you can pass on the folder
name as a command line argument. \QC looks for a session that matches the folder name and
loads it. Or it looks for a project file in the folder and opens it. For example:
......@@ -88,6 +96,16 @@
\li -client
\li Attempt to connect to an already running instance of \QC.
\row
\li -pid
\li Attempt to connect to an already running instance of \QC with
the specified process ID.
\row
\li -block
\li Open files in editors in a running \QC instance and block the
command line until the first editor is closed.
\row
\li -load <plugin>
\li Load the specified plugin.
......@@ -113,6 +131,11 @@
\li -color <color>
\li Core plugin: override the selected UI color.
\row
\li -presentationMode
\li Core plugin: display keyboard shortcuts as popups when you
press them. Mostly useful when presenting \QC to someone else.
\row
\li -debug <pid>
\li Debugger plugin: attach to the process with the given process ID.
......@@ -146,9 +169,9 @@
and sysroots.
\row
\li -wincrashevent <event-handle>
\li -wincrashevent <event-handle:pid>
\li Debugger plugin: Attach to crashed processes by using the specified
event handle.
event handle and process ID.
\row
\li -customwizard-verbose
......@@ -162,10 +185,6 @@
Open the projects and files that were open when you last exited \QC.
For more information about managing sessions, see \l{Managing Sessions}.
\row
\li -block
\li Open files in editors in a running \QC instance and block the
command line until the first editor is closed.
\endtable
\section1 Using Custom Styles
......
......@@ -43,11 +43,12 @@
code and translations. The lrelease tool is used to create run-time
translation files for use by the released application.
To synchronize ts files from a translator with the application code,
To synchronize translation source (TS) files from a translator with the
application code,
select \gui {Tools > External > Text > Linguist > Update Translations
(lupdate)}.
To generate from the ts files qm translation files that can be used by an
To generate from the TS files Qt message (QM) files that can be used by an
application, select \gui {Tools > External > Text > Linguist > Release
Translations (lrelease)}.
......
......@@ -96,9 +96,9 @@
to \c %HOMEDRIVE%%HOMEPATH% when the Git executable is run and authorization
works as it would with \c {git bash}.
\section1 Setting Up Common Options
\section1 Setting Up General Options
Select \gui{Tools} > \gui{Options} > \gui{Version Control} > \gui{Common}
Select \gui{Tools} > \gui{Options} > \gui{Version Control} > \gui{General}
to specify settings for submit messages:
\list
......@@ -109,33 +109,36 @@
parameter. If there is an error, the script should output a
message on standard error and return a non-zero exit code.
\li \gui{User/alias configuration file} takes a file in mailmap format
that lists user names and aliases. For example:
\li \gui{User/alias configuration file} is a text file that lists
author names in mailmap format. For each author, you must specify a
real name and email address and optionally an alias and a second
email address. For example:
\code
Jon Doe <Jon.Doe@company.com>
Jon Doe <Jon.Doe@company.com> jdoe <jdoe@somemail.com>
Hans Mustermann <Hans.Mustermann@company.com> hm <info@company.com>
\endcode
\note The second line above specifies the alias \e{hm} and the
corresponding email address for \e{Hans Mustermann}. If the
user/alias configuration file is present, the submit editor
displays a context menu with \gui{Insert name} that pops up a
dialog letting the user select a name.
After you specify a file in this field, you can select authors
as values of the submit message fields in the \gui Nicknames dialog.
\li \gui{User fields configuration file} is a simple text file
consisting of lines specifying submit message fields that take
user names, for example:
authors as values, for example:
\code
Reviewed-by:
Acked-by:
Initial-patch-by:
Reported-by:
Rubber-stamped-by:
Signed-off-by:
Tested-by:
\endcode
The fields above appear below the submit message. They provide
completion for the aliases/public user names specified in the
\e{User/alias configuration file} as well as a button that opens the
aforementioned user name dialog.
After you specify a file in this field, you can add authors as
values of the submit message fields when submitting changes. If
you also specified a \gui{User/alias configuration file}, you can
select authors in the \gui Nicknames dialog.
\li \gui{SSH prompt command} specifies an ssh-askpass command that you
can use (on Linux) to prompt the user for a password when using SSH.
......
\section1 Running on Embedded Linux Devices
\list 1
\li Build and run the application for a device:
To build and run the application for a device:
\list 1
......@@ -13,8 +11,6 @@
\endlist
\endlist
\QC uses the compiler specified in the project build settings
(tool chain) to build the application.
......
......@@ -48,12 +48,17 @@
\list 1
\li Select a \l{glossary-buildandrun-kit}{kit} for the project.
\li Click the \gui {Build and Run Kit Selector} icon (1) or select
\gui Build > \gui {Open Build and Run Kit Selector} to select the
build and run \l{glossary-buildandrun-kit}{kit}.
\image qtcreator-kit-selector.png "Kit selector"
\li Choose \gui {Build > Build Project} or press \key {Ctrl+B}.
You can also select the \gui Run button (2) to also deploy and run
the application after building it.
\endlist
For more information on the options you have, see
......@@ -63,4 +68,10 @@
subproject, you can use the \gui Build menu commands to build a file or
subproject.
To remove all build artifacts, select \gui Build > \gui {Clean All} or
\gui {Clean Project}. To clean the build directory and then build the
project, select \gui Build > \gui {Rebuild All} or \gui {Rebuild Project}.
To run qmake to generate new Makefiles, select \gui Build > \gui qmake.
*/
......@@ -39,6 +39,8 @@
selecting \gui Help > \gui {About Plugins} > \gui {Build Systems}
> \gui {QbsProjectManager} and restarting \QC.
\section1 Building Qbs
To build the Qbs plugin yourself from the \QC git repository:
\list 1
......@@ -46,7 +48,7 @@
\li Fetch the Qbs submodule in your \QC git checkout with
\c {git submodule update --init}.
\li Run qmake on \QC and build \QC again.
\li Use Qbs or qmake and make to build \QC again.
\li Enable the Qbs plugin as described above.
......@@ -69,10 +71,88 @@
\c Depends item for a Qt application. For examples, see the
\c {examples} directory in the qbs repository.
\li Select \gui Projects to specify \gui {Build Settings} for the
project.
\li Select \gui {Build Steps} > \gui Details to specify build steps:
\image creator-qbs-build-app.png
\list 1
\li In the \gui {Build variant} field, select \gui Debug to
include debug symbols in the build for debugging the
application and \gui Release to create the final
installation file.
\li In the \gui {Parallel jobs} field, specify the number of
parallel jobs to use for building.
\li Select the \gui {Enable QML debugging} check box to debug
Qt Quick application projects.
\note Debugging requires opening a socket at a well-known
port, which presents a security risk. Anyone on the Internet
could connect to the application that you are debugging and
execute any JavaScript functions. Therefore, you must make
sure that the port is properly protected by a firewall.
\li In the \gui Properties field, specify the properties to pass
to the project. Use colons (:) to separate keys from values.
For more information, see
\l{http://qt-project.org/doc/qbs/language-introduction.html}
{Modules} in the Qbs Manual.
\li In the \gui Flags field:
\list
\li Select \gui {Dry run} to test building without
executing commands or making permanent
changes to the build graph.
\li Select \gui {Keep going} to continue building when
errors occur, if possible.
\li Select \gui {Check timestamps} to retrieve the
timestamps from the file system instead of using the
ones stored in the build graph. You only need this
option if you made changes to the build directory
manually, which is not recommended.
\endlist
\endlist
The \gui {Equivalent command line} field displays the build command
that is constructed based on the selected options.
\li Select \gui {Clean Steps} > \gui Details to specify flags for the
cleaning step.
\image creator-qbs-build-clean.png
\list
\li Select \gui {Clean all artifacts} to remove all build
artifacts.
\li Select \gui {Dry run} to test cleaning without executing
commands or making permanent changes to the build graph.
\li Select \gui {Keep going} to continue cleaning when errors
occur, if possible.
\endlist
The \gui {Equivalent command line} field displays the clean command
that is constructed based on the selected options.
\li Select \gui Build > \gui {Build Project} to build the application.
\li Click the
\inlineimage qtcreator-run.png
(\gui Run) button to build, deploy, and run the application.
(\gui Run) button to deploy and run the application.
\endlist
*/
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