Commit Graph

67787 Commits

Author SHA1 Message Date
Eike Ziller
88b9ef5c5b Bump version to 4.12.4
Change-Id: I8175830fb3a6f006ebd6f71441452ac04587ce44
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
v4.12.4
2020-07-07 06:44:20 +00:00
Christian Stenger
c12294c1b2 AutoTest: Align file and line information of sub-items
Avoid displaying the file and line information inverse-cascaded
and fix initialization of the internal layout positions.

Change-Id: Ic9493741c58ece6074f659de110c9cabadafe7d6
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-07 05:11:26 +00:00
Christian Stenger
c7bc8a98ac Python: Fix highlighting of parentheses
This enables the PythonEditor to handle (un)matching
parentheses correctly.

Change-Id: I31516a5fee922de6b3cfc2254b209739bc42c540
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-07 05:11:11 +00:00
Aleksei German
f5d9091f56 QmlDesigner: Add Singleton support to BindingModel
Task: QDS-2477

Change-Id: I8aa25325e2f4fe714af26038280ed774aef1216f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-06 16:07:24 +00:00
Orgad Shaneh
8951ddfd62 Debugger: Support sysroot override
Sometimes the same toolchain can be used with different versions of
sysroots. Support this in command-line and dialogs.

Change-Id: Id49f8e8c50f4856e979eecbbdebc680b57dc69b2
Reviewed-by: hjk <hjk@qt.io>
2020-07-06 16:04:49 +00:00
hjk
b60ab85c13 Android: Prevent crash in case there is no Qt version set
For CMake build.

Change-Id: I77946a5d7023a9cefc23baf243991949121e49ec
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 15:15:18 +00:00
hjk
dbb70c4f83 ClangCodeModel: Remove some unneeded static_cast<int> of ints
Continues 7ab6783e24.

Change-Id: I1f80ae5d20163d1d5da79dc26ea3129bd3599066
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-06 15:14:45 +00:00
hjk
f0628cca29 ClangCodeModel: Replace nested ClangCodeModel::Utils namespace
... by the customary ::Internal.

It adds only noise on the user side and conflicts regularly with
the top-level ::Utils namespace.

Remove a (now) duplicated definition of setLastSentDocumentRevision().

Plus minor namespace related fixes.

There are still minor conflicts between Utils::Text and
ClangCodeModel::Text

Change-Id: I2e8df6b3c6c3599192774032822ee7e778355bba
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-06 15:12:28 +00:00
Eike Ziller
770b07f71c Merge remote-tracking branch 'origin/4.13'
Change-Id: I0125351c7c6fa33f9fc7171469493e4fa53e87c4
2020-07-06 16:43:39 +02:00
The Qt Project
5671b3a7be Merge "Merge remote-tracking branch 'origin/4.12' into 4.13" into 4.13 2020-07-06 14:24:55 +00:00
Eike Ziller
b18711da91 Merge remote-tracking branch 'origin/4.12' into 4.13
Conflicts:
	share/qtcreator/debugger/lldbbridge.py

Change-Id: Ia444f6424fb35b9a539e157afcee868161535272
2020-07-06 16:23:13 +02:00
Christian Kandeler
8bd6453d76 CppTools: Fix warning about fall-through
Change-Id: I6984265c4678b70e2684908b144560b6fbd542dd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-06 14:11:02 +00:00
Christian Kandeler
8bc01aee75 qbs build: Fix sdktool autotest
Change-Id: I069d9b3eaea295efa8d78d4d96b52b61cecbb783
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-06 14:10:46 +00:00
Leena Miettinen
c1df1e5d2e Debugger: Fix UI text punctuation
Change-Id: I022d38ed62293d9db8632efb1ae63ee882e381c9
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 13:42:12 +00:00
Aleksei German
1a0f8ceb3d QmlDesigner: Add singletons to Binding Editor
- Added singletons as targets in binding editor combo boxes
 - Added better numeric types support to binding editor
 - Added better color types support to binding editor

Task: QDS-2468

Change-Id: I5462b5a71761666006b6248632932e819d91b3c1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-06 13:11:16 +00:00
Thomas Hartmann
c16de88a12 QmlDesigner: Remove Controls 1 dependencies
Change-Id: I085d24265669c55777e0c63b5f6fb26a8d0fe631
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-06 13:03:42 +00:00
hjk
20be1f5ddf Debugger: Set WITH_DEBUGGER_DUMPERS to ON by default
The option went in with the initial CMale port, presumably because
the test itself created and compile qmake projects at the time.

I do not think it makes sense to leave out existing tests by default,
even if they run for some time.

Change-Id: I7ff055a2a432b9d8f6af16f7da63ebc56995c31e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 11:15:34 +00:00
hjk
e1c88116b3 Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 11:15:18 +00:00
Andre Hartmann
c9eedbe0f3 Git: Port colorful log to text colors
Fixes: QTCREATORBUG-24198
Change-Id: Icde06da5ac848fb0f7faf02a8e55fb26136f318c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-07-06 10:55:43 +00:00
Robert Loehning
d35cf4b846 Squish: Stabilize tst_HELP02
Depending on the sizes of the treeview and its contents, the
click might hit the scroll bar and result in a script error.

Change-Id: Ic3658b1f180d1aa5a792d6664d2d7f56d8d0c353
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-06 10:48:25 +00:00
Orgad Shaneh
e3312205ed Dumper: Adapt to Id that moved from Core to Utils
Change-Id: I6437d813234dc22923a313d540f115e070edeba7
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-06 09:37:21 +00:00
Eike Ziller
410f051710 Change log for 4.12.4
Change-Id: I04fb6e04f4690b2370ec7a475491d8e10d3c0139
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 09:24:23 +00:00
Eike Ziller
d0e3f5ca98 Fix debugging C++ on iOS devices
Partially revert 7f958700a0 for 'remote-ios'.
The original commit changed the way attaching to a remote server or process
works, attempting to make it work with lldb-server on a remote linux device.
That breaks connecting to the debugging server on iOS devices.

Fixes: QTCREATORBUG-23995
Change-Id: I7a793fa73a564a4ef19cf82e13c2ad50d4247ee3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-06 09:18:40 +00:00
Christian Kandeler
11a7ccb865 CppEditor: Relax soft assert
The look-up results are ordered by precedence and we can just use the
first one; there doesn't seem to be a reason that additional results
should stop the operation.

Fixes: QTCREATORBUG-14531
Change-Id: Ibe12f975f87ae0d526299219ff54492bef34065c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-06 08:42:51 +00:00
Eike Ziller
1de74cceab Merge remote-tracking branch 'origin/4.13'
Change-Id: I015bac0cccdf466a923c706abdedd8bd8800b0cd
2020-07-06 10:30:54 +02:00
Alessandro Portale
dd505ef413 McuSupport: Change version checking from exact == to >= minimum
So far, one Qt Creator version supported exactly one Qt for MCUs
version, mainly because of incompatibilities in-between Qt for MCUs
versions.

The compatibility of 1.2 with 1.3 and further is now deemed stable
enough to loosen the version checking.

This change replaces the exact versions comparison (between Qt for MCUs
SDK version and what Qt Creator supports) to a minimum version check of
what Qt Creator supports.

One limitation that remains is that you can only have one kit per target,
across the supported Qt for MCUs versions. To mend this, UI changes are
required (in a separate commit).
Workaround for now: If you want e.g. Desktop Kits for different Qt for
MCUs versions at the same time, you need to work with kit clones.

Task-number: QTCREATORBUG-24293
Change-Id: Ifd31cd2eadbc1d7fa02415e1928d0047cf007f7c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 08:24:20 +00:00
Alessandro Portale
6fec04d6de McuSupport: Find default FreeRTOS dir inside pre-installed board SDK
Qt for MCUs 1.3 ships the board/MCU SDKs, and also adds the subdir to
the FreeRTOS component inside the board/MCU SDKs as "boardSdkSubDir" to
the .json files (see: UL-2760).

Task: Qt Creator needs to lookup that "boardSdkSubDir" value and use it
to construct a default path for the FreeRTOS path.

Task-number: QTCREATORBUG-24300
Change-Id: Ie3c8186b76443d5fe3640226ea61aa8b14779d54
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 07:51:48 +00:00
Alessandro Portale
00bb6ea958 Icons: Adapt export.py to Inkscape 1.0 (+cleanup)
The "--shell" mode changed in Inkscape from version 0.9 to 1.0, so that
the export.py had to be adapted.

While doing that, it was also time to split up this Spaghetti pile
into functions.

Change-Id: I6346a6eb9b4be546333ee60fa1d34c2ba8e1a347
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-06 07:36:01 +00:00
Thomas Hartmann
b978af12ae QmlDesigner: Remove ExtendedFunctionButton
Change-Id: Ia8b7933ccb9b33d5d09b2a7edd862937246d97d8
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-06 07:16:30 +00:00
Thomas Hartmann
d1e21dd615 QmlDesigner: Remove custom controls 1 styles
Change-Id: I695813e7b97caf7355211550856e51a398566ae9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-06 07:16:04 +00:00
Thomas Hartmann
98f84cd539 QmlDesigner: Remove GroupBox
This is unused.

Change-Id: If128fe35d6dd925cd4ff4999b2050e61325230da
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-06 07:15:46 +00:00
Eike Ziller
fac9b8875b Fix build
The metatype declaration requires QList.

Amends b077a4b845

Change-Id: I1fed2420b6bfb6eb1def09808ecc07ec0a5990e9
Reviewed-by: hjk <hjk@qt.io>
2020-07-06 06:46:48 +00:00
Christian Kandeler
15a1266d50 clangbackend: Do not handle built-in types specially
... when collecing tooltips. The more general functions provide more
information, such as constness.

Fixes: QTCREATORBUG-14950
Change-Id: I6d0a890a695e19e9754b5538ba092a188a3bbbb0
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-07-06 06:32:33 +00:00
hjk
a2bf75bb55 Debugger: Add test for char * display
Change-Id: I7319ab6c12aab30e58c5b9fd9223534745fa741c
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 06:20:18 +00:00
hjk
430a33dcd9 Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-06 06:07:13 +00:00
David Schulz
4924392620 ClangRefactoring: fix compile
Amends:
2915ee0832

Change-Id: I06aa40fedcdca8c9cdf1e731ba068c9c6cf94ca6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-06 05:56:34 +00:00
Andre Hartmann
884de236be Git: Fix whitespace
Change-Id: I9b61d018179449f61fd38de7957fabc1c9bc917d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-07-04 19:12:05 +00:00
Christian Kandeler
4c2938a366 Fix qbs build
Change-Id: Ic19d1f42d98a0bec31f2f5788063f6b2e7d61cef
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-03 14:49:01 +00:00
Eike Ziller
5c6c892388 Add changes file for 4.12.4
Change-Id: I4f98bdfddfe0ba3a4d9fa9473ae91d026f453b5a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-07-03 12:13:20 +00:00
Eike Ziller
d9e9d783a6 Complete documentation on Core::ModeManager
Change-Id: Id1890a851e5a448665141093f49874546b785da6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-07-03 12:13:05 +00:00
Miikka Heikkinen
fccc02de96 QmlDesigner: Allow starting free drag on initial selection press
Changed object selection to be done on press instead of click, and
the initial press now also starts free drag of the selected object
after a short distance moved to prevent accidental drags.

Change-Id: I61656661cd734d167ef9f8db42d986f0e97402a3
Fixes: QDS-2376
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-07-03 11:35:49 +00:00
Tobias Hunger
195690973e GccToolchain: Also handle compilers named cc and c++
This fixes a common cause for duplicate kits during import: The
projects are configured to use one of these compilers, Creator says
it can't support them, resulting in a kit without a ToolChain.

This in turn will fail the comparison between temporary kits, so
the same kit will get created twice.

Right after the kit gets created, it gets fixed up again, so the kit
seems very sensible after the import is done.

Task-number: QTCREATORBUG-22702
Task-number: QTCREATORBUG-20582
Change-Id: I19c8f2e1131818dd9ab86c656001893ec3c083bf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-03 11:28:30 +00:00
Eike Ziller
b077a4b845 Add documentation for Core::Id
Was changed to an alias for Utils::Id.

Change-Id: Ib1b166a27b16939f8b6c3e5888dab8248660658a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-07-03 11:13:24 +00:00
Leena Miettinen
3bee2353c2 Clang Tools: Fix UI text capitalization
Change-Id: I2466706699b82cdcd41e285aa68185eabd4bbb40
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-03 09:10:44 +00:00
Orgad Shaneh
00e814fdd1 Debugger: Respect "Use Dynamic Object Type for Display"
Broke in 5efa84830b.

Task-number: QTCREATORBUG-24280
Change-Id: Ice4b9d826d2402efb354180886d35926a2513e5a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-03 09:07:46 +00:00
Thomas Hartmann
94f9544df5 QmlDesigner: Rename CppTypeData to QmlTypeData
Also adding getQMLSingletons().
The Backendmodel now also knows about QML singletons.

Change-Id: I96e130678ef956e569960c431f45bd362d026f5f
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-03 08:47:29 +00:00
Assam Boudjelthia
c05755a2e1 Android: set summary widget ticks to false by default
To avoid any false positives.

Change-Id: I30a0056975d99a85230b83df44dd119a9f1dabcd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-07-03 08:15:30 +00:00
Assam Boudjelthia
e3e0dd6c4d Android: pass sdkMaanger to allEssentialsInstalled() to keep sync
Change-Id: Ibe8385140c0d64394941b215324b70138d6f0cdf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-07-03 08:14:14 +00:00
Alessandro Portale
dccdd41ab9 McuSupport: Adjust license headers
Change-Id: I00ce0c63c59f6d20f8244ea9c693259044d0f7b8
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
2020-07-03 07:48:51 +00:00
Leena Miettinen
7f436e23ac Doc: Add "Setting Up Meson" to "All Topics"
To display it correctly in the Help Contents.
Also exclude the topic from the Qt Design Studio Manual build.

Change-Id: I2536ef7214faf12c3e1ff533449db12f87a58aeb
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-07-03 06:20:33 +00:00