Commit Graph

63610 Commits

Author SHA1 Message Date
Christian Kandeler
5451b78367 Project Tree: Add functionality to expand a single node recursively
From time to time, I find myself wanting to fully expand
a specific sub-tree.

Change-Id: Ie49b76a7a7a6fae3684bbdfb5735638bbc41b301
Reviewed-by: hjk <hjk@qt.io>
2020-02-20 09:56:31 +00:00
hjk
04f933fd67 Android: Inline aabPath computation
Mainly to avoid an explicit use of BuildStep::buildConfiguration()

Change-Id: I96f1403d0aa2b9f5bcde06e994809466700b1357
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-20 09:47:39 +00:00
Christian Kandeler
72d83fddf2 MiniProjectTargetSelector: Merge two pairs of classes
Change-Id: I7b6e1c603da2c6457e150fcb5f60c11a844b2f34
Reviewed-by: hjk <hjk@qt.io>
2020-02-20 09:12:23 +00:00
Aleksei German
3f8da54e7d QmlDesigner: Annotation Multiselect
Change-Id: Ia7a84c321d5cd1e2522bf277a903c78ec24ce156
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-20 08:50:59 +00:00
Assam Boudjelthia
0a8d675c66 Android: fix Android options page blocking behavior
The change 286266 was causing an unwanted modal dialog upon entering
Options > Devices page, this fixes that.
Also, this fixes the synchronous SDK and AVD list reloading that was
causing some hang time upon opening Devices page.

Fixes: QTCREATORBUG-23581
Change-Id: I1a55aaadb873c77612aced1c687cc5a0ded3441d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-20 08:40:38 +00:00
Leena Miettinen
09ab60ffa2 Doc: Fix Editor Manager docs
- Fix issues that cause QDoc warnings for documented classes
- Mark undocumented classes \internal

Fixes: QTCREATORBUG-23618
Change-Id: I436ab501858a2a469b910e863139d2b1296dea19
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-20 08:35:06 +00:00
David Schulz
29dc8e740f LanguageClient: fix soft assert for uninitialized server
Do not send close documents notifications to an uninitialized server

Fixes: QTCREATORBUG-23598
Change-Id: Iaabd082203a91a56ebcd60f93e6a0c97048e89c1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-20 07:50:40 +00:00
David Schulz
5a2de2609e Python: detect language server for python asynchron
Change-Id: I775e4cc21dc443b9ec6af81fabef9cf2bfd4e7d2
Fixes: QTCREATORBUG-23599
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-20 05:42:17 +00:00
Junker, Gregory
e7f784ca73 Support configurable trailing-whitespace cleanup
Allow the user to configure how trailing whitespace is handled. In some
file types, for example, Markdown, trailing whitespace is semantically
important. This change allows the user to select, via delimited list of
wildcard filename patterns, which files to ignore for trailing
whitespace cleanup.

Task-number: QTCREATORBUG-13358
Change-Id: Ie6814d8c178bed8e3de78e6d359b9940d2ba0ead
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-19 18:09:13 +00:00
Orgad Shaneh
dec8113377 Git: Fix accelerator for reflog
R is already used for Rebase.

Change-Id: I64575c98bf22aef0a2825b68b1c9a92061821923
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-19 17:48:19 +00:00
hjk
3fe1911d46 ProjectExplorer: Introduce some BuildStep convenience accessors
... and use in ProcessStep and related classes.

Change-Id: Ie6f1403d0aa2b9f5bcde06e994809466700b1357
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-19 16:11:05 +00:00
hjk
3f68292dbe ProjectExplorer: Introduce ToolChainKitAspect::{c,cxx}ToolChain
Special accessors to the repeatedly used C and C++ cases to denoise
and slim down user code.  Plus some code cosmetics nearby.

Change-Id: Iba4662bd4731d8c4256e658529f39d5c995691ce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-19 15:59:12 +00:00
Thomas Hartmann
bbf5ff61ea QmlJSCheck: Allow animations in ui.qml files
Task-number: QDS-1613
Change-Id: I4beecff16d0b67652abbdb16945614d2497d3921
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-19 15:47:14 +00:00
Christian Kandeler
0634b34c48 ProjectExplorer: Do not disable "Deploy" action if step list is empty
We do not listen for changes to the step lists, so the state of the menu
actions is not properly updated at the moment. Doing so would incur an
aonnying amount of book-keeping, which is simply not necessary
considering there is no harm running an empty deploy configuration.

Change-Id: Ia0b0ea6369d4c17c6049872e285b2968474027e1
Reviewed-by: hjk <hjk@qt.io>
2020-02-19 15:46:36 +00:00
Cristian Adam
193fa40b34 GitHub Actions: Fix MSVC CDB debugger
Install the VC Runtime for the qtcreatorcdbext component

Change-Id: I22a7620be51acca53313bcac4b54746214d7b13f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-19 14:36:26 +00:00
Tobias Hunger
57662de841 CMake: Remove tealeaf reader mode
*** This removes support for CMake < 3.7 ***

Change-Id: Iddb0bab1a61b814adb4cb7ffa217284e96cb1140
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 14:05:42 +00:00
Cristian Adam
266991740b CMake Build: Set CXX_EXTENSIONS to OFF for QtCreator plugins
This makes sure that if you have a plugin and set the
C++ standard to 14, but forget to set CXX_EXTENSIONS to OFF
you don't get weird PCH compilation failures.

Change-Id: I66edf6431624f667ba400e8ef79f2ad6170e3ca2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 13:59:01 +00:00
Aleksei German
9a09dd8a88 QmlDesigner: minor fixes for Annotations
- Mac dialog window fix
 - Changed behavior on add new tabs action
 - Removed unused code

Change-Id: I0579b1ba85fb535464b2d5160a85a898f2e78a76
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 13:55:35 +00:00
Thomas Hartmann
34f417a2e4 Qml tooling: Support Qt 5.15
...and keep the default at 5.12

Change-Id: I15439c2d71a0610971dc39246e8b98e9653b8f04
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-19 13:22:24 +00:00
Tobias Hunger
39cddf5d03 DebuggerAspect: Simplify handling of Qml debugging
There should not be a need to have the linkQmlDebuggingLibrary Q_PROPERTY
anymore. The property is added for the benefit of the DebuggerAspect, which
can just check relevant BuildConfigurationAspect directly.

Change-Id: Ic47ca9e26911e096564fe77bd14bebe959b4f116
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-19 12:58:40 +00:00
Alessandro Portale
bc25c7b3fe McuSupport: Remove flashing of bootloader for STM
An earlier version of Qt for MCUs had run CMake targets like
flash_<application>_and_bootloader.

At some point they were removed. Now, Qt Creator will not use that CMake
target, as-well.

Change-Id: Ie122acd042f816fafd27779d164e87ec00c509a5
Reviewed-by: hjk <hjk@qt.io>
2020-02-19 12:57:37 +00:00
Eike Ziller
c34864ccab macOS: Disable library validation when signing
So we can load 3rdparty plugins even when the app is signed and notarized.
Also give Qt Creator "debugging" capabilities, allowing it to attach
to processes.

Change-Id: Ia6bb8ab279920b75a96777eafebbb4e7454fda46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 12:53:02 +00:00
Robert Loehning
fd2653bdc2 Squish: Remove outdated error handling
Change-Id: If3bb6f8dd5c79e11139801623f63ce88ea46cf42
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-19 11:58:57 +00:00
Cristian Adam
873a543c6f CMake Build: Do not set suffix for qtcreatorcdbext dll
Change-Id: Id0b5692df1661fe1e20b77d1e538c01fbb974b5e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 10:34:08 +00:00
Andre Hartmann
fc54911441 QmlDesigner: Fix signed/unsigned comparison warning
plugins/qmldesigner/components/curveeditor/detail/graphicsscene.cpp:129:33:
warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
             if (curveItem->id() == id)
                 ~~~~~~~~~~~~~~~~^~~~~

Change-Id: I0a89701755c47b37e5ea0a0d6717d78e10bb619d
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 10:05:36 +00:00
Andre Hartmann
e5a3084e97 QmlDesigner: Fix unused-but-set-variable warning
plugins/qmldesigner/components/formeditor/formeditoritem.cpp:649:19:
warning: variable ‘pos’ set but not used [-Wunused-but-set-variable]
     const QPointF pos = qmlItemNode().flowPosition();
                   ^~~

Change-Id: Ia5c59bd47ab6b5dd6324280214f60ca5dabdc9f6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 10:03:46 +00:00
Andre Hartmann
e5dd68990f QmlDesigner: Fix unused parameter warnings
Change-Id: I79e815bf366b002b951198d47e1197738a77593a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 10:02:30 +00:00
Thomas Hartmann
5be19869aa QmlDesigner: Use NodeHints for reparenting in container
Change-Id: Id7ee463a5d526979ee6cc802d28deb7d79b94a07
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 09:58:56 +00:00
hjk
5064bddff6 Work around QLocalSocket::error deprecation
Centralizing does not bring much benefit here, it's just six locations,
and having either a central #include <QLocalSocket> in algorithm.h
or a separe file does not sound better.

In any case, it is absurd, that deprecating functions to "make code
nicer" requires spilling #if QT_VERSION_CHECK over the code.

Change-Id: Ia9a8c0eb6ef7cabbaffb46cfe472247e26e7e2c2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 09:57:04 +00:00
Thomas Hartmann
0ed1d1c374 QmlDesigner: Use canBeContainer for animations
Change-Id: I18bd1038426334f51f42d2423c1cdb35c8b5f2c1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 09:56:59 +00:00
Eike Ziller
8a18ccdef9 Add script for building Qt Creator for packaging
The result is a number of 7zips in the build directory
that can be packaged in an installer, or unzipped
on a different machine directly

Change-Id: Ic1a691678b2268c08e9159c1958dbecefc640fc3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-19 09:56:08 +00:00
hjk
a68aee95a1 ProjectExplorer: Replace ProjectConfiguration::m_macroExpander
... by MacroExpanders in Build and RunConfiguration. Deploy didn't
use its own, BuildStep always composed an empty expander with
the BuildConfiguration's, uses now the BuildConfiguration's expander
directly.

Change-Id: I9de51bfc32aeb3d73f4974175e42a37807e49ac1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-19 09:31:02 +00:00
hjk
e63a6744ba ProjectExplorer: Make some noise in BuildStep::buildSystem
... when it is potentially diverting to a wrong build configuration.

Change-Id: Ib2b11268cf64e9a969e7636cb2d70f1843f5c7a4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-19 09:19:19 +00:00
Christian Kandeler
faf7e8f49a QbsProjectManager: Do not store expanded qbs executable path
... unless it was explicitly set by the user.
Otherwise, e.g. the derived Creator-internal path will end up verbatim
in the settings, and this value will be wrong when switching the build
dir etc.

Change-Id: I89818e683f403e28855934e42b56f59892f260cc
Reviewed-by: hjk <hjk@qt.io>
2020-02-19 09:00:21 +00:00
Eike Ziller
fee9bf9cb8 Fix documentation for ExtensionSystem::invoke
For new qdoc

Change-Id: Icc4e78bebcf102d58b6b06c8c6b72b738a98db28
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 08:59:53 +00:00
hjk
89e2327f23 ExtensionSystem: Replace a deprecated endl
Change-Id: Ib6b297b0176518d3bc2db1e45476cc9e8c00b2e0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 08:34:31 +00:00
hjk
006da25949 Boot2Qt: Adapt to QProcess::startDetached() deprecation
Change-Id: I2793c4298ddc30831454de8664a8ccd8e8678bd5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 07:43:44 +00:00
Orgad Shaneh
ee05e49f79 Git: Support entry list in reflog
Change-Id: Ic24eff465c6870f42c1964a8700cc6f0b2c0dce5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-19 07:23:42 +00:00
Orgad Shaneh
857102748d Git: Refine editor names
Change-Id: I8302e1341e589b3c0e39c3d6c1d73b01e142e517
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-19 07:23:26 +00:00
Orgad Shaneh
c728d04b52 Git: Support reflog also for branches
Change-Id: I9321ba4964d086d90aaf540a2006f95b94de8375
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-19 07:23:11 +00:00
Orgad Shaneh
c9f1d84db7 Git: Add config widget to reflog
Change-Id: I04a9bd86c38ab27537c2d6981179a667bc36e61b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-19 07:22:57 +00:00
Eike Ziller
e886c13abc Make documentation part of branding
So Design Studio can build different documentation than Qt Creator

Change-Id: I078df39d36533a1659caac937ef869e4bf0c7a43
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-19 06:57:53 +00:00
Eike Ziller
15eccee798 Merge remote-tracking branch 'origin/4.12'
Change-Id: I25baa2e1dc0a06fac6e16471ca70ba2000588797
2020-02-19 07:40:32 +01:00
Eike Ziller
edc3eccd12 Merge remote-tracking branch 'origin/master' into 4.12
Change-Id: I20de58817658e2c715ce550761976ae67b3bef4d
2020-02-19 07:37:41 +01:00
Andre Hartmann
937e2b56e7 VcsOutputFormatter: Fix multiple regexp matches
Fixes: QTCREATORBUG-23614
Change-Id: I86e548a1f727113782afbc6b934d6dddc92c92ea
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-18 19:19:26 +00:00
Andy Shaw
e22eea1cf3 Fix the Python templates
This fixes the templates so that they do not produce any warnings
and also includes QQuickItem in the choice of base classes

Change-Id: I58bbd462052f5d2a64bb8c4bea5bbdcd15e66700
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2020-02-18 16:13:20 +00:00
Christian Kandeler
5bb6c7f0cf ProjectExplorer: Call RunConfiguration::update() when restoring
Otherwise, the executable path will not be set right after cloning a run
configuration. This is due to the fact that it's not a stored attribute,
but is retrieved from the build system.

Change-Id: I948a2765b5b5d7707b44a72fcde7559e2742284c
Reviewed-by: hjk <hjk@qt.io>
2020-02-18 15:04:41 +00:00
Robert Loehning
0b6386d1f8 Squish: Update QtOptionsPageWidget
Fixes error in tst_default_settings

Change-Id: I927edb0cab7c73a4830272cf6fb2f655cee4cd8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:43:52 +00:00
Robert Loehning
3e9437d8c5 Squish: Update chooseTargets()
Fixes tst_cmake_speedcrunch

Change-Id: I154647ca2108676b4184170ef121649547c3fd41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:42:34 +00:00
Denis Shienkov
6e1032f235 BareMetal: Allow to choose 'tools.ini' for UVSC provider configuration
An each Keil installation contains an own 'tools.ini' file.
The "tools.ini" file is used to determine the paths to the installed
debugger drivers as well as to the device software packs. These drivers
and packs are displayed on a UVSC provide configuration widget and are
used for debugging.

Previously, a path to 'tools.ini' file was detected automatically
from the configured Kit of the opened project, using the
SessionManager::startupTarget() method (a Kit contains the debugger
path, which is the uVision executable).

But, in that case the user can't configure the UVSC provider if a
project is not opened yet.

This issue is solved by adding a path chooser to the UVSC provider
configuration widget. That allows to user to choose the desired
'tools.ini' file instance in any time.

Change-Id: Ife44d69704c9dd2102baecb0ff1954fa4bc05f1e
Reviewed-by: hjk <hjk@qt.io>
2020-02-18 14:42:02 +00:00