Commit Graph

1571 Commits

Author SHA1 Message Date
Eike Ziller
c635c6b50a Merge remote-tracking branch 'origin/4.1'
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
	src/plugins/android/androidrunner.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h
	tests/system/suite_WELP/tst_WELP03/test.py

Change-Id: Ibac4d71d4f4dbe1e4f05052d2f8a2dcfd82edd4c
2016-09-13 12:15:09 +02:00
Leena Miettinen
f491ece833 Doc: Replace "Qt Build System" with "Qbs"
Change-Id: Ic9f17f16e5cfdf3aa02aa772772031876b7bcb77
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-09-06 09:09:14 +00:00
Eike Ziller
841778ed69 Merge remote-tracking branch 'origin/4.1'
Change-Id: I80f96f100046625f24b6ab5d13fdb05660365abc
2016-08-22 16:30:56 +02:00
Leena Miettinen
1d39d8aba7 Doc: Remove reference to obsolete qtquicklayouts.index file
Add a link to the Layout QML type and fix the name of the import
to stop an autolink from being generated to the wrong target.

Change-Id: Id2ca5e418ea6d254813a20f00b6623ff21dda09a
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-08-19 07:48:16 +00:00
Leena Miettinen
a181ef93c4 Doc: Replace the last references to OS X with \macos or macOS
The API docs still contain references to OS X.

Change-Id: I622eb4d2c79f3162f5dc95e04be262d628c8d7b9
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-08-18 08:35:43 +00:00
Marco Bubke
8932e0bcb4 Clang: Point people to our download location
The LLVM packages from the standard page are stripped down but we need
libTooling.

Change-Id: I16dd86158e97b1778e0ad1640c9f2c27d09f3c9f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-09 16:10:32 +00:00
Orgad Shaneh
1853f01a5b Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
2016-08-05 11:40:07 +02:00
Leena Miettinen
f474eec40f Doc: Describe shortcuts for moving within and between blocks
- Describe the "Enable smart selection changing" option and
  the keyboard shortcuts used.
- Update screen shot.

Change-Id: I6ea08db91d1143c756573e6de8d5a50db994091f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-08-04 14:33:37 +00:00
Leena Miettinen
c1190f0a54 Doc: Specifying keyboard shortcuts for Emacs actions
Change-Id: Idaf76b2cc04c064d85c4cdbc5963e352df4ff6cc
Reviewed-by: hjk <hjk@qt.io>
2016-08-04 11:16:09 +00:00
hjk
1e8ffa20d0 Doc: Introduce a macro \macos to adapt to upcoming renamings
Start with an initial value 'macOS' and use in uncontroversial
places in the docs. Some explicit references to older versions
are untouched in this patch.

Change-Id: Ibea4115c45fc2ff2c9a0518d92797df26fd4138f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-08-03 15:30:06 +00:00
Leena Miettinen
715378c2e6 Doc: Describe Autorun CMake check box in CMake options
Update the screenshot.

Change-Id: I3d0970b0f9dd9ff92f19e67c19de824f03859d76
Task-number: QTCREATORBUG-15934
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-03 09:04:24 +00:00
Leena Miettinen
ab0164b705 Doc: Describe C++ Options Getter and Setter tab
Add and update screenshots.

Change-Id: Ie5cd6502d66217db488a5f16dbc6d2bd70906954
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-02 15:12:01 +00:00
Leena Miettinen
443c3f93f3 Doc: Restructure the beautifier topic
Add a screenshot of general options.

Change-Id: I32ddc7a71449b1459930e74d65b034969870e5e7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-02 15:11:20 +00:00
Leena Miettinen
82c565e9d3 Doc: Describe requesting Clang warnings
Add a screenshot.

Change-Id: I5586d30e3a5e8701d44f96d65fc498410ceaa70d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-02 14:59:34 +00:00
Leena Miettinen
1b76ca3704 Doc: Update screenshot of Build & Run General options
To show the new icon.

Change-Id: I5e71db7d553b73f066422fe19b4f9b5327cdb71e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-02 14:29:06 +00:00
Leena Miettinen
7513d055f2 Doc: Add screenshot of Search Results > Find in File System
Change-Id: If43c6a8ea5c6d60d29b505b55144ef4651ec0ec8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-02 14:28:53 +00:00
Leena Miettinen
59f184b69b Doc: Add missing text
Change-Id: I37192b7fdb6e093a39bc2522c73e84b62ec6f9a2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-08-02 08:35:30 +00:00
Leena Miettinen
13da2bcc57 Doc: Add Nim code snippets to list of editable snippets
Change-Id: I77234d5b79cbd7c4a7c96548ac3ef1c23bed66c9
Reviewed-by: hjk <hjk@qt.io>
2016-08-01 15:07:00 +00:00
Leena Miettinen
d1a5d164b1 Doc: Add QML JS static analysis message M128
"Error: A state cannot have the specified child item"

Change-Id: I83b4916126e0abe6b3b5ab5c6ccfc171e82fde4e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-01 07:17:45 +00:00
Orgad Shaneh
35d7352b3e Merge remote-tracking branch 'origin/4.1'
Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f
2016-07-29 16:13:18 +03:00
Leena Miettinen
ecbd1fa408 Doc: Update creating components and screens with Qt Quick Designer
Add dependency to the Qt Quick Controls 2 docs

Change-Id: Idcbb856cf38d8867dc781ade572cf18f87983912
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:10:13 +00:00
Leena Miettinen
7ad279e99d Doc: Update Qt Quick Designer connection editor docs
- Update the screenshot
- Use "select" instead of "specify", because items and
  properties can be selected from lists.

Change-Id: I292f7900d956c682e3f4b6071bbef9a6362cc6be
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-29 07:34:25 +00:00
Leena Miettinen
55466483cb Doc: Update descriptions of Qt Quick Application wizards
Some fields are only available in some wizards.

Change-Id: Ibecca943fcd5ce8bdc131896762093c1918d56cd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-29 07:34:11 +00:00
Leena Miettinen
412c221ddc Doc: Describe Qt item model wizard
Change-Id: I22256c3060623a8350a96a56274d5cb2fc2504bb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-29 07:32:18 +00:00
Leena Miettinen
efe1e70ea2 Doc: Update info about QML file wizards
Change-Id: I71a6f068c1b310bf2038379afde63c1ad32652a6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-29 07:32:06 +00:00
Leena Miettinen
659950e95d Doc: Using Ctrl+N and Ctrl+P shortcuts to navigate in locator
Change-Id: I290f148e5a7ceba42d3fe17a70ec59efcb774aef
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-29 07:31:17 +00:00
Leena Miettinen
735bf2cf09 Doc: Fix capitalization of "Editor settings" label in docs
Change-Id: I3ee24f7eb52c71057ee88004d98acd977dbd2841
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-07-28 13:05:06 +00:00
Leena Miettinen
bce5aca625 Doc: Update Git docs
- Fix paths to functions
- Describe Reset button in Branches dialog
- Update screenshot

Change-Id: I873921a8ee0d4ec6e3572be01e5c59e51adb7a0a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-27 14:51:00 +00:00
Leena Miettinen
2ab466ea04 Doc: Describe model and state chart wizards
Add the Qt SCXML index file to be able to link to the module
docs.

Change-Id: Ibd28071cdc3c98c07fb91c73732d809ffed5333b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-27 14:21:04 +00:00
Leena Miettinen
909f815098 Doc: Java class wizard
Change-Id: I65a68dca5c2f1db578c250bcbac7fc06951a8355
Reviewed-by: hjk <hjk@qt.io>
2016-07-27 09:05:47 +00:00
Leena Miettinen
87db5ba69f Doc: Add docs for "Import as qmake Project" wizard
Change-Id: I38bcf939a9092c7f77d2b0839df4477e68462101
Reviewed-by: hjk <hjk@qt.io>
2016-07-27 08:22:48 +00:00
Leena Miettinen
5b3242b0b3 Doc: Update icon names
Add an image for an icon that consists of 2 masks, and
therefore cannot be used directly from source.

Change-Id: Iffcf274db1dc1444c894aabaa6452747f95089f8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-26 11:23:50 +00:00
Leena Miettinen
a8fce64f35 Doc: Fix link broken by a section title change
To-Do List > To-Do Entries to match the output pane title.

Change-Id: Ia37ff8a49b91a1db5773a0bd37f80b87ad1c8049
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-07-26 07:36:40 +00:00
Leena Miettinen
dc8fcdf028 Doc: Fix To-Do Entries output pane name in docs
Change-Id: Id03b410653be4ae75f6a98ea7af045ac35575ce8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2016-07-25 14:48:45 +00:00
hjk
13fbcb2d3e Debugger: Bump LLDB requirement to 3.8 on Linux
There was an official release in June, and given that LLDB on Linux
is still fragile, requiring at least the latest officially released
version seems in order.

Change-Id: Iabbdc654071b28166c7f9ea550eaa7db304cb4a0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-07-25 09:31:25 +00:00
Orgad Shaneh
1b34f2a4b8 Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia90424d479936a898705c433e5810c77ae088b2c
2016-07-22 15:18:00 +03:00
Leena Miettinen
3ef66cd753 Doc: Replace "Dynamic Properties" with "Properties"
The label name was changed, but the doc was not fixed.

Change-Id: I585db2824837f1b076133306d3af5276bcdaae28
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-20 14:00:26 +00:00
Ulf Hermann
11af2f487f QmlProfiler: Fix some misspellings of "Flame Graph"
Change-Id: I281b327eeb53d1159b165f72abee7ebe442a68ff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-19 09:55:29 +00:00
Nikolai Kosjar
9650adad14 Clang: Require at least LLVM 3.8.0
Change-Id: I2de3eef7bc06cba6298d64a9a042a01decc05384
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-11 08:22:32 +00:00
Eike Ziller
0e923c2a75 Merge remote-tracking branch 'origin/4.1'
Change-Id: I5cdc704c827a6f5abf4dc39e2a131d53df328bd2
2016-06-22 11:29:12 +02:00
Eike Ziller
4f9016e03f Merge remote-tracking branch 'origin/4.0' into 4.1
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/android.qbs
	src/plugins/android/androiddevice.cpp
	src/plugins/autotest/testcodeparser.cpp
	src/plugins/debugger/analyzer/analyzerstartparameters.h
	src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.h

Change-Id: I2474d06f2309fa71210a8401846bc2ef85bebf1d
2016-06-22 11:09:32 +02:00
Leena Miettinen
66c0bf54b7 Doc: Add docs for experimental Nim plugin
Change-Id: Ie866334c37b626a8e6eea0d58092134d3f545d4d
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-22 07:31:13 +00:00
Leena Miettinen
083b1175c9 Doc: Link to released Qt Quick Controls 2 docs
Change-Id: I5ddb23ae1f78aae136869fd335030b530e1f266a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-20 08:16:12 +00:00
Albert Astals Cid
d701abcc24 Fix blockedForSync description
Having "to synchronize the QML state into the scene graph" makes it
seem as if it would be the counterpart of "sync" in the render
thread loop and it is not

Change-Id: Id8efc3bddf5ea5c15d93a63f195e16f0966bb4f8
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
2016-06-17 12:20:08 +00:00
Leena Miettinen
359127ec09 Doc: Update info about creating JSON wizards
Change-Id: Id45d3f9228ab35a57c0cc5a0d044bc510727c637
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-17 09:33:37 +00:00
Tobias Hunger
6b9b8af01c CMake: Recommend cmake version 3.3.2 or later
Earlier versions work, but do not report a mapping between targets and
files. This will make all files end up in one ProjectPart and thus have
targets with custom flags/defines/include paths fail.

Change-Id: Ie1fb9f616de120be1f88528db42b0a2152787606
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-06-17 08:39:13 +00:00
Lorenz Haas
3af36134d1 Beautifier: Make all tools MIME restrict-able
The newly introduced auto save option is restricted to user definable
MIME types. The underlaying tool's restriction, however, is only if the
current editor is a cpp editor. This patch makes the tools also MIME
types restrict-able. In addition the auto save functionality is now only
applicable if the file matches the auto save MIME types as well as the
MIME types of the chosen tool.

Change-Id: Ic430b4a07341647e6c8e95d2b802a17db1637a36
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-06-01 07:41:37 +00:00
Eike Ziller
0c5bae640b Merge remote-tracking branch 'origin/4.0'
Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa
2016-05-27 12:01:36 +02:00
Leena Miettinen
32ff202a79 Doc: Describe Qt Quick Controls 2 Application wizard
Update screenshots.

Change-Id: I6069e08113cae83142d249e3f331586acce63ca9
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-26 09:56:50 +00:00
Victor Heng
a4e96636e3 Doc: Fix indentation in JSON wizard 'Label' example
Change-Id: I306fa9a6e973260a65947cd5d78aed1e48ad1030
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-22 21:35:43 +00:00