Commit 9e66ce48 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/4.0'

 Conflicts:
	src/plugins/autotest/testcodeparser.cpp
	src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
	tests/unit/unittest/unittest.pro

Change-Id: I9db4fbea6ea7c9fdd0d8e1703735af20c92e754b
parents f63d6433 605ea627
......@@ -46,6 +46,7 @@ QMake Projects
CMake Projects
* Increased minimum CMake version to 3.0
* Changed CMake to run automatically in the background
* Added CMake generator setting per kit
* Added CMake configuration setting per kit and build configuration
......
......@@ -4,7 +4,21 @@ url = http://doc.qt.io/qtcreator
headerdirs =
sourcedirs = $SRCDIR/src
imagedirs = $SRCDIR/images $SRCDIR/templates/images
imagedirs = $SRCDIR/images \
$SRCDIR/templates/images \
$SRCDIR/../src/libs/qmleditorwidgets/images \
$SRCDIR/../src/plugins/android/images \
$SRCDIR/../src/plugins/autotest/images \
$SRCDIR/../src/plugins/classview/images \
$SRCDIR/../src/plugins/coreplugin/images \
$SRCDIR/../src/plugins/debugger/images \
$SRCDIR/../src/plugins/diffeditor/images \
$SRCDIR/../src/plugins/help/images \
$SRCDIR/../src/plugins/projectexplorer/images \
$SRCDIR/../src/plugins/qmldesigner/components/formeditor \
$SRCDIR/../src/plugins/qmldesigner/components/navigator \
$SRCDIR/../src/plugins/texteditor/images
outputdir = $OUTDIR
exampledirs = $SRCDIR/examples
examples.fileextensions += *.qml *.svg
......
TARGET = TextFinder
TEMPLATE = app
QT += widgets
SOURCES += main.cpp\
textfinder.cpp
......
doc/images/qmldesigner-reset-view.png

331 Bytes | W: | H:

doc/images/qmldesigner-reset-view.png

157 Bytes | W: | H:

doc/images/qmldesigner-reset-view.png
doc/images/qmldesigner-reset-view.png
doc/images/qmldesigner-reset-view.png
doc/images/qmldesigner-reset-view.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-analyze-start-button.png

728 Bytes | W: | H:

doc/images/qtcreator-analyze-start-button.png

505 Bytes | W: | H:

doc/images/qtcreator-analyze-start-button.png
doc/images/qtcreator-analyze-start-button.png
doc/images/qtcreator-analyze-start-button.png
doc/images/qtcreator-analyze-start-button.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-debug-button-stop.png

575 Bytes | W: | H:

doc/images/qtcreator-debug-button-stop.png

485 Bytes | W: | H:

doc/images/qtcreator-debug-button-stop.png
doc/images/qtcreator-debug-button-stop.png
doc/images/qtcreator-debug-button-stop.png
doc/images/qtcreator-debug-button-stop.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-debugging-continue.png

804 Bytes | W: | H:

doc/images/qtcreator-debugging-continue.png

488 Bytes | W: | H:

doc/images/qtcreator-debugging-continue.png
doc/images/qtcreator-debugging-continue.png
doc/images/qtcreator-debugging-continue.png
doc/images/qtcreator-debugging-continue.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-expand.png

911 Bytes | W: | H:

doc/images/qtcreator-expand.png

97 Bytes | W: | H:

doc/images/qtcreator-expand.png
doc/images/qtcreator-expand.png
doc/images/qtcreator-expand.png
doc/images/qtcreator-expand.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-image-viewer.png

13.6 KB | W: | H:

doc/images/qtcreator-image-viewer.png

3.81 KB | W: | H:

doc/images/qtcreator-image-viewer.png
doc/images/qtcreator-image-viewer.png
doc/images/qtcreator-image-viewer.png
doc/images/qtcreator-image-viewer.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-run-selected-tests.png

526 Bytes | W: | H:

doc/images/qtcreator-run-selected-tests.png

591 Bytes | W: | H:

doc/images/qtcreator-run-selected-tests.png
doc/images/qtcreator-run-selected-tests.png
doc/images/qtcreator-run-selected-tests.png
doc/images/qtcreator-run-selected-tests.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-show-subprojects.png

960 Bytes | W: | H:

doc/images/qtcreator-show-subprojects.png

443 Bytes | W: | H:

doc/images/qtcreator-show-subprojects.png
doc/images/qtcreator-show-subprojects.png
doc/images/qtcreator-show-subprojects.png
doc/images/qtcreator-show-subprojects.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -72,7 +72,7 @@
CPU Usage Analyzer.
\note If data collection does not start automatically, select the
\inlineimage qtcreator-analyzer-button.png
\inlineimage recordfill.png
(\uicontrol {Collect profile data}) button.
\endlist
......
......@@ -52,6 +52,15 @@
diagnostics from it, select \uicontrol {Clang Static Analyzer} in
the \uicontrol Projects mode.
\section1 Supported Project Types and Tool Chains
The Clang Static Analyzer relies on the data (specific macros and include
directories) from the projects and tool chains. Not all projects
and tool chains can provide enough data for reasonable results.
Currently, only Qbs and qmake projects together with the GCC, MinGW, Clang
and Microsoft Visual Studio tool chains are supported.
\section1 Setting Up Clang Static Analyzer
As a tested version of Clang is shipped together with Qt Creator, no manual
......
......@@ -63,8 +63,7 @@
\li Use the application to analyze it.
\li Select the
\inlineimage qtcreator-debug-button-stop.png "Stop button"
\li Select the \inlineimage stop_small.png "Stop button"
button to view the results of the analysis in the
\uicontrol {Analysis} view.
......@@ -171,8 +170,7 @@
\li Use the application to analyze it.
\li Select the
\inlineimage qtcreator-debug-button-stop.png "Stop button"
\li Select the \inlineimage stop_small.png "Stop button"
button to view the results of the analysis in the \uicontrol Profile
view.
......
......@@ -92,7 +92,7 @@
QML Profiler.
\note If data collection does not start automatically, select the
\inlineimage qtcreator-analyzer-button.png
\inlineimage recordfill.png
(\uicontrol {Enable Profiling}) button.
\endlist
......
......@@ -140,8 +140,7 @@
\li Select \uicontrol Tools > \uicontrol Options > \uicontrol Android to add paths to the
Android NDK and SDK.
You can use the
\inlineimage qtcreator-options-android-download-button.png
You can use the \inlineimage download.png
(\uicontrol Download) buttons to go to the sites where you can download
the Android NDK and SDK.
......
......@@ -109,12 +109,9 @@
work correctly due to a logic error. To locate this logic error, step
through the code using the following buttons:
\inlineimage qtcreator-debug-button-stop.png
(\uicontrol Stop),
\inlineimage qtcreator-debug-button-step-over.png
(\uicontrol {Step Over}),
\inlineimage qtcreator-debug-button-step-into.png
(\uicontrol {Step Into}),
and \inlineimage qtcreator-debug-button-step-out.png
(\uicontrol {Stop Debugger}), \inlineimage debugger_stepover_small.png
(\uicontrol {Step Over}), \inlineimage debugger_stepinto_small.png
(\uicontrol {Step Into}), and \inlineimage debugger_stepout_small.png
(\uicontrol {Step Out}).
*/
......@@ -74,8 +74,7 @@
\image qtquick-example-setting-breakpoint2.png
\li Click the
\inlineimage qtcreator-debug-button-step-into.png
\li Click the \inlineimage debugger_stepinto_small.png
(\uicontrol {Step Into}) button on the toolbar or press \key F11 to step
into the code in the stack. The samegame.js file opens in the code
editor at the function that starts a new game.
......
......@@ -50,8 +50,8 @@
Use the toolbar to navigate between open files and symbols in use. To browse
backward or forward through your location history, click
\inlineimage qtcreator-back.png
(\uicontrol {Go Back}) and \inlineimage qtcreator-forward.png
\inlineimage prev.png
(\uicontrol {Go Back}) and \inlineimage next.png
(\uicontrol {Go Forward}).
To go to any open file, select it from the \uicontrol {Open files} drop-down
......@@ -94,7 +94,7 @@
\li To split the editor view into a top and bottom view, select
\uicontrol Window > \uicontrol Split, press \key {Ctrl+E, 2}, or
select the \inlineimage qtcreator-split-button.png
select the \inlineimage splitbutton_horizontal.png
(\uicontrol Split) button and then select \uicontrol Split.
Split command creates views below the currently active editor view.
......@@ -122,8 +122,7 @@
To remove a split view, place the cursor within the view you want to
remove and select \uicontrol Window > \uicontrol {Remove Current Split},
press \key {Ctrl+E, 0}, or select the
\inlineimage qtcreator-remove-split-button.png
press \key {Ctrl+E, 0}, or select the \inlineimage splitbutton_closetop.png
(\uicontrol {Remove Split}) button. To remove all but the currently selected
split view, select \uicontrol Window > \uicontrol {Remove All Splits} or
press \key {Ctrl+E, 1}.
......
......@@ -63,12 +63,11 @@
removed text and then select \uicontrol {Apply Chunk}.
To view the differences in a unified view where changed rows are placed
below each other, select
\inlineimage qtcreator-switchto-unified-diffeditor.png
below each other, select \inlineimage unifieddiff.png
(\uicontrol {Switch to Unified Diff Editor}).
To switch back to the side-by-side view, select
\inlineimage qtcreator-switchto-sidebyside-diffeditor.png
\inlineimage sidebysidediff.png
(\uicontrol {Switch to Side by Side Diff Editor}).
To change the default colors, select \uicontrol Tools > \uicontrol Options >
......@@ -105,11 +104,10 @@
By default, the horizontal scroll bars in the left and right pane are
synchronized. To use them independently of each other, select the
\inlineimage qtcreator-synchronizefocus.png
\inlineimage linkicon.png
(\uicontrol {Synchronize Horizontal Scroll Bars}) button.
If the files change outside \QC, select
\inlineimage qtcreator-regenerate-index.png
If the files change outside \QC, select \inlineimage reload_gray.png
(\uicontrol {Reload Editor}) to compare them again and to show the results.
To send a chunk of changes to a \l{Pasting and Fetching Code Snippets}
......
......@@ -1416,10 +1416,9 @@
If the text is found, all occurrences are highlighted as you type.
\li To go to the next occurrence, click \inlineimage qtcreator-next.png
\li To go to the next occurrence, click \inlineimage next.png
(\uicontrol {Find Next}), or press \key F3. To go to the previous
occurrence click
\inlineimage qtcreator-previous.png
occurrence click \inlineimage prev.png
(\uicontrol {Find Previous}), or press \key {Shift+F3}.
\endlist
......@@ -1641,17 +1640,18 @@
\li To go directly to an instance, double-click the instance in the
\uicontrol {Search Results} pane.
\li To move between instances, click \inlineimage qtcreator-forward.png
and \inlineimage qtcreator-back.png
in the \uicontrol {Search Results} pane.
\li To move between instances, click the \inlineimage next.png
(\uicontrol {Next Item}) button and \inlineimage prev.png
(\uicontrol {Previous Item}) button in the
\uicontrol {Search Results} pane.
\li To expand and collapse the list of all instances, click
\li To expand and collapse the list of all instances, click the
\inlineimage qtcreator-expand.png
.
(\uicontrol {Expand All}) button.
\li To clear the search results, click
\inlineimage qtcreator-clear.png
.
\li To clear the search results, click the
\inlineimage clean_pane_small.png
(\uicontrol Clear) button.
\endlist
......@@ -2110,7 +2110,7 @@
edit a function signature and by applying the changes to the
matching code.
\li Function signature. When this action is available, a light bulb
icon appears: \inlineimage qml-toolbar-indicator.png
icon appears: \inlineimage refactormarker.png
\row
\li Add #include for undeclared or forward declared identifier
\li Adds an \c {#include} directive to the current file to make the
......@@ -2558,7 +2558,7 @@
\list 1
\li In the locator, click \inlineimage qtcreator-locator-magnify.png
\li In the locator, click \inlineimage magnifier.png
(\uicontrol Options) and select \uicontrol Configure to open the
\uicontrol Locator options.
......
......@@ -87,6 +87,9 @@
the editor to copy all elements to the clipboard by using 300 dpi. Then
paste the diagram to an application that can print images.
If you copy a selection of elements in the editor, only those elements and
their relations will be copied to the clipboard as an image.
To save diagrams as images, select \uicontrol Tools >
\uicontrol {Model Editor} > \uicontrol {Export Diagram}.
......@@ -179,12 +182,21 @@
\endlist
\li To move the end of a relation to a different element, grab the
end point and drop it over another element that accepts relations
of that type. For example, only classes accept inheritances and
associations.
\li To create \e {sampling points} that divide a relation into two
connected lines, select a relation and press \key Shift+Click.
If possible, the end point of a relation is moved automatically to
draw the line to the next sampling point either vertically or
horizontally. To remove the selected sampling point, press
\key Ctrl+Click.
connected lines, select a relation and press \key Shift and click
on the relation line.
If possible, the end point of a relation is moved automatically
to draw the line to the next sampling point either vertically or
horizontally.
\li To remove a sampling point, press \key Ctrl and click the sampling
point.
\li To group elements, drag and drop a \uicontrol Boundary element to
the editor and resize it to enclose the elements in the group.
......@@ -240,14 +252,7 @@
\endlist
\li In the \uicontrol Members field, specify members for the
class. Enter each member on a separate line using a C++
like syntax. For example, the following lines define the
method \c m that is private, virtual, and constant:
\code
private:
virtual int m(string a) const;
\endcode
class, as described in \l {Specifying Members}.
\li Select \uicontrol {Clean Up} to format the contents of
the \uicontrol Members field depending on their visibility
......@@ -273,13 +278,60 @@
and relationship.
To create self-relations, start creating a new association and press
\key Shift to create a new \e {intermediate point} while dragging the
association. Create another intermediate point and drop the association
\key Shift to create a new \e {sampling point} while dragging the
association. Create another sampling point and drop the association
at the same class.
To add more points, press \key Shift and click a relation. To delete a
point, press \key Ctrl and click a point.
\section2 Specifying Members
To specify members for the class, enter each member on a separate line
using a C++ like syntax. For example, the following lines define the
method \c m that is private, virtual, and constant:
\code
private:
virtual int m(string a) const;
\endcode
You may group members:
\code
[Geometry]
QPointF position;
QSizeF size;
\endcode
You may add stereotypes to members:
\code
<<setter>> setPosition(const QPointF &pos);
\endcode
There are some limitations of the parser:
\list
\li Multi-line declarations work only if lines are wrapped
within nested brackets:
\code
void setSize(int width,
int height);
\endcode
\li Preprocessor macros will not be translated. Some Qt
keywords are recognized (for example Q_SLOT).
\li Function pointer declarations are interpreted as methods.
\li \c throw() and \c noexpect() specifiers are not ignored
but will make the declaration a method.
\endlist
\section1 Creating Component Diagrams
You can add source code components, such as libraries, databases, programs,
......@@ -314,17 +366,19 @@
adds the \c UseCase custom element:
\code
Icon UseCase
Title: "Use-Case"
Elements: item
Stereotype: 'usecase'
Display: icon
Width: 40
Height: 20
BaseColor: #5fb4f0
Begin
Ellipse 20, 10, 20, 10
End
Icon {
id: UseCase
title: "Use-Case"
elements: item
stereotype: 'usecase'
display: icon
width: 40
height: 20
baseColor: #5fb4f0
Shape {
Ellipse { x: 20, y: 10, radiusX: 20, radiusY: 10 }
}
}
\endcode
For more information about the available options, see \e standard.def
......@@ -333,5 +387,9 @@
You can add your own definition file and save it with the file extension
\e .def to add custom colors and icons for stereotypes, elements, or tool
bars.
bars. Either store this file in the the same directory as the
\e standard.def file or select the root element of a model and apply your
\e .def file to the property \uicontrol {Config path}.
*/
......@@ -156,7 +156,7 @@
\li Open a project that contains tests.
\li In the \uicontrol {Test Results} output pane, select
\inlineimage qtcreator-run.png
\inlineimage run_small.png
(\uicontrol {Run All Tests}) to run all test or
\inlineimage qtcreator-run-selected-tests.png
(\uicontrol {Run Selected Tests}) to run the selected tests.
......@@ -233,7 +233,7 @@
\endtable
To view only messages of a particular type, select
\inlineimage qtcreator-filter.png
\inlineimage filtericon.png
(\uicontrol {Filter Test Results}), and then select the types of messages to
show.
......
......@@ -113,8 +113,7 @@
\list 1
\li Click the
\inlineimage qtcreator-help-add-bookmark.png
\li Click the \inlineimage bookmark.png
(\uicontrol {Add Bookmark}) button on the toolbar.
\li In the \uicontrol {Add Bookmark} dialog, click \uicontrol OK to save the
......@@ -166,7 +165,7 @@
If you cannot find words that you know are there, indexing might not have
been completed for some reason. To regenerate the index, click
\inlineimage qtcreator-regenerate-index.png
\inlineimage reload_gray.png
(\uicontrol {Regenerate Index}).
Punctuation is not included in indexed terms. To find terms that contain
......
......@@ -135,7 +135,7 @@
\section1 Showing and Hiding the Sidebar
To toggle the sidebar in the \uicontrol Edit and \uicontrol Debug modes, click
\inlineimage qtcreator-togglebutton.png
\inlineimage sidebaricon.png
or press \key Alt+0 (\key Cmd+0 on OS X).
For more information on using the sidebar, see
......
......@@ -155,15 +155,14 @@
\list
\li To toggle the sidebar, click \inlineimage qtcreator-togglebutton.png
\li To toggle the sidebar, click \inlineimage sidebaricon.png
(\uicontrol {Hide Sidebar/Show Sidebar}) or press \key Alt+0
(\key Cmd+0 on OS X).
\li To split the sidebar, click \inlineimage qtcreator-splitbar.png
\li To split the sidebar, click \inlineimage splitbutton_horizontal.png
(\uico