Commit Graph

67787 Commits

Author SHA1 Message Date
Orgad Shaneh
b52ffa2501 Git: Move addChangeActions from GitEditor to GitClient
Change-Id: Id901994ac2909b00ca58a0a8a91d2d3a273c39b3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2020-02-26 10:40:21 +00:00
Orgad Shaneh
7c4f0a9b1e Git: Store singleton instance in GitClient
On many cases, GitPlugin is not required at all, and is only used as
a proxy for GitClient.

Change-Id: I246012658ab3e8c7a12f1a459b1b1748ff358e0b
Reviewed-by: hjk <hjk@qt.io>
2020-02-26 10:29:27 +00:00
Orgad Shaneh
5765bd8507 Git: Make addChangeActions a static function
Will move and reuse it for output window links.

Change-Id: Iad5a164e9a30c38ea9bac07989196b9361384339
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-26 10:28:34 +00:00
David Schulz
4422805cec Dumper: replace xrange with range
Change-Id: I09b3dd4da548643e927dbc5bb3130c28a746396b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-26 10:26:55 +00:00
Eike Ziller
72d5708388 More change log for 4.12
Change-Id: I4a3302b95561fb99650d8c29fdedc4f629139567
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-26 10:12:55 +00:00
David Schulz
1f37eaa265 Editor: Fix crash in codeassist
We have to report back to the code assistant even if we have no results.
Otherwise the processors aren't correctly reset and may be called after
deletion.

Change-Id: Id7af2e0ee9f631efc00beb2a84bfe1824e138d24
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-26 08:18:58 +00:00
Leena Miettinen
4cd4316a16 Doc: Replace "pane" with "view"
...for anything listed in Window > Views, except "Output Pane".

Task-number: QTCREATORBUG-23582
Change-Id: I1a46de22657dd5779d693a5078b5aca8b1b57a37
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-26 08:10:19 +00:00
David Schulz
af52b65d6a Editor: Fix self recursive update
The update rect should be identical to the calculated line rect when
repainting the current line highlight. And the offset must not be
calculated into the line rect since we just want to repaint the complete
viewport width.

Fixes: QTCREATORBUG-23647
Change-Id: I0656f0fee4823c8ff55c70b2a4cd69f0183e141d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-26 08:09:54 +00:00
Eike Ziller
61dc14b67f Merge remote-tracking branch 'origin/4.12'
Change-Id: I3e7049da2c3da6f784e3cb3407c22ada556e5d24
2020-02-26 08:35:05 +01:00
Eike Ziller
fa59e02f89 Merge remote-tracking branch 'origin/4.11' into 4.12
Change-Id: I8cc80483cdb10309bf73aba5cfab52c1d90e1bbc
2020-02-26 08:14:47 +01:00
Eike Ziller
a8cca1b89a build.py: Remove unused 'temp' directory
Change-Id: I7b6a45aa2ac1d0851207512e2659f46f1940f628
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-26 07:01:23 +00:00
Eike Ziller
095311c072 Fix visibility of init and reset commands in debugger start dialogs
The labels must be hidden in addition to the input fields.

Amends b858e58d3f

Change-Id: I77cfafd11cd8dc739ab8dea669d8f8c84a9a4774
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-02-26 06:59:58 +00:00
Eike Ziller
0acce09457 cmake build: Fix qdoc call for LLVM-based qdoc
It requires us to pass a whole bunch of include paths manually,
including Qt include paths.

Extracts a stripped down list of include paths from all the plugin and
library targets that we know of.
On macOS, also gets Qt's framework path derived from the QtCore location.

Since these can contain generator expressions, we have to write them to
a file (so the expressions are resolved).
We pass this file with qdoc options with the hidden "@" command line
feature of qdoc.

Task-number: QTCREATORBUG-22451
Change-Id: Ifae6960023cc6e63cd66104417dd4a16f2e491a2
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-26 06:42:51 +00:00
Ville Voutilainen
82dab12acd Android: make icon removal actually work
Also adjusts icon preview sizes and adds a master icon from which
the other icons are generated.

Task-number: QTCREATORBUG-23283
Change-Id: I21c3d11f9b5d4d815dc6d9ad7c2363b67767d03a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-25 20:07:54 +00:00
Jochen Becher
23946de457 modeleditor: Intersect relations with shape of item
Change-Id: I40d898715772f74ffa225ac27b91ee7ad4d8fedc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-25 19:21:48 +00:00
Thomas Hartmann
bc62269304 QmlDesigner: Fix ZoomAction
Task-number: QDS-1720
Change-Id: I310679df54536841e0a7c6591bd1d03280c5280c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-25 16:54:27 +00:00
Christian Stenger
ece83d8e49 QmlDesigner: Fix compile for Qt5.11
Amends 4176b17fff.

Change-Id: Ib9a95757bc4cbcf8ce13c432e5fda8b95282936b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-25 14:54:56 +00:00
hjk
06b2023420 Debugger: Remove "IdentifyDebugInfoPackages" feature
This was only ever working with SuSE and GDB, and nobody
ever tests it, nor asks for extension to other setups.

Change-Id: I7b1e3cc8c9f71df4c86b957a79d5afe02eec0758
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 14:13:01 +00:00
Alessandro Portale
4ba24500aa StudioWelcome: properly deploy welcome Qml module
...by also adding files without extensions (qmldir)

Change-Id: Ibe86e84b1b9f7237cee1d2a9149bf90555ca3a6b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-25 13:40:29 +00:00
hjk
cc857390f8 QmakeProject: Use buildsystem's own build config for toolchain tests
It is currently only getting there if it's the active one, so it is
not a real problem, but distracting.

Change-Id: I1f83644a71a3f22e23f966e273c1a23cfc0cc6b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-25 13:38:53 +00:00
Leena Miettinen
2c406ff398 Doc: Describe managing workspaces
Conceptually separate dockable views from sidebar views, because
the former can now be organized using workspaces in the Design
mode (where the sidebars are now disabled).

Fixes: QTCREATORBUG-23582
Change-Id: Iaf310d4fbc9277330708f6756201e4b43dc1eedb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 13:38:04 +00:00
Leena Miettinen
ac26d3bab9 Doc: Add Core:: namespace to \fn commands
To suppress QDoc warnings.

Task-number: QTCREATORBUG-23620
Change-Id: I4e5c633e7a0066f892f3247c28dac055557e68da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 13:37:46 +00:00
Leena Miettinen
98e940c9b3 Doc: Display Core plugin classes in the API Reference
Task-number: QTCREATORBUG-23620
Change-Id: I64b3fc9ebd9ec140a28a5fbb2f70961086821ed2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 13:37:30 +00:00
Kai Koehne
fda9955df0 Globally disable WindowContextHelpButtonHint
Do set the global application flag AA_DisableWindowContextHelpButton
to avoid having to unset the default WindowContextHelpButtonHint
in every single dialog.

AA_DisableWindowContextHelpButton was added in Qt 5.10.

Change-Id: I21fe8bc5ddfa4c01ec7a799b04bfb6ff1c9d6d86
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 13:26:44 +00:00
David Schulz
44db8e2eab Dumper: replace import * with explicit imports
Using imports like

 from foo import *

is considered as bad habit and it reduces
static code analysis usability.

Change-Id: I56a175f4c7b231e2b8e486bd9d1c65543720f56a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-25 13:22:50 +00:00
Orgad Shaneh
c063c6d407 ADS: Only build if QmlDesigner is enabled
Change-Id: I8ca3bd5fab714e003ad05e502e5759f06ca77fed
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 13:21:17 +00:00
David Schulz
8625bbfe5a LanguageClient: Fix client restart after crash
Do not clear open documents but disconnect and deactivate them,
so they can be correctly reopened once the server is restarted.

Change-Id: I0f61a5461c020865e61d9808e8c645ea842f64ad
Fixes: QTCREATORBUG-23648
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-25 13:17:13 +00:00
David Schulz
45381e9d04 LanguageClient: Only send contentsChanged notification to reachable clients
Change-Id: Id35b94d3c6f9b3b08b1e66b992ca5fe86cdab6d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-25 13:17:05 +00:00
David Schulz
83eab470c1 LanguageClient: Only send position changed signals to reachable clients
Change-Id: I0d387ea10aeba8f5f1be3d0ddb6a6ccb82e04e64
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-25 13:16:58 +00:00
hjk
bb783eb819 Help: Drop use of nullptr for default QFlag
Last one.

Change-Id: Iaef520ad4a0050544fc46ec3cde10c42675448e4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 13:15:46 +00:00
Orgad Shaneh
dd0efea95d Misc: Fix MSVC warnings
C4573: the usage of 'QObject::connect' requires the compiler to capture 'this' but the current default capture mode does not allow it

and implicit conversions from size_t to int

Change-Id: If9b4ba3103cadd5b2a38ba7072d05aa1488a87bb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2020-02-25 12:19:53 +00:00
Miikka Heikkinen
9b5e642400 QmlDesigner: Fix crash building against Qt 5.15
QGradient construction has changed in 5.15 so that it will no longer
allow creating a gradient for the final enum that indicates the number
of presets rather than actual preset.

Change-Id: I5304b924890f8ae4530834a2b34062e789147c5d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-25 11:55:48 +00:00
hjk
e5d1e9d274 Work around QHash::unite deprecation
Change-Id: Ibf199b5e3f2ca99b7e0cafe20893a509d9eab906
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 10:43:10 +00:00
David Schulz
63e9c4c31a Editor: Prevent setting negative position in block selection
Fixes: QTCREATORBUG-23622
Change-Id: I0f041a772869695e7d460effd4b0d58f94ce55ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-25 09:49:06 +00:00
hjk
aeef7137a2 CppTools: Work around a endl warning
And drop some foreach use.

Change-Id: I2ba4762cf6c5c8de7262a47044f65624d585e21a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-25 09:27:56 +00:00
hjk
7dbf2c01c7 iOS: Some IosDeployStep cosmetics
Change-Id: If9834af39b9c06373da472b3e0624051730f785a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 09:10:54 +00:00
Christian Stenger
be250deeed QmlDesigner: Fix building tests on Windows
Change-Id: I7b55b2b222821ef5f8980ad67552a7b31b49ac2b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-25 08:16:37 +00:00
Andre Hartmann
73fd611988 ExternalTool: Add timestamps to message output
Change-Id: I14048833c1e16812defe0e5f70379f18480c8633
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-25 08:16:19 +00:00
Alessandro Portale
3a29497717 CMake build: Add a qtc_glob_resources function
This is the CMake equivalent of "RESOURCES = $$files()" from qmake.

Use it in StudioWelcome for the Qml resources.

Change-Id: I2f495e2c4bad9f0bb488dee7e8966e31acb51b5a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-24 16:37:27 +00:00
hjk
ca2dd71d77 QmlDesigner: Avoid warnings about unused parameters
Change-Id: I37ca27bc1e808454be11c856429efe87428700e4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-02-24 15:52:11 +00:00
Thomas Hartmann
0a4471dbbb QmlDesigner: Rename 'Imports' to 'QML Imports'
Change-Id: Ice57052273ac2e7eef555c9a26a9032098541d8e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-24 15:42:53 +00:00
hjk
b0847af740 Fix some translation contexts
Change-Id: I5471cca06970bc01a77cd1e2fd00890d3f22349f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-24 14:46:17 +00:00
hjk
87e4704356 Debugger: De-virtualize and de-slot DebuggerEngine::show*Message
Apparently not used virtually/weakly anymore, so make it easier
to reason about used code paths.

Last users apparently were QmlCppEngine and TrkAdapter. Both gone.

Change-Id: I5ab7d261362bede9a4cf622f4c124726deca83e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-24 14:37:48 +00:00
Christian Stenger
5d3e56b3b4 QmlDesigner: Fix compile with Qt5.11 and building tests
Change-Id: I96dea7de0d185c67ea3a26a42de0805bd60dc1d1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-02-24 13:40:07 +00:00
hjk
989b44d911 VcsBase: Don't use QObject inheritance in VcsEditorFactory
The only remaining use is a setProperty that's never read back
anymore after 9c96a1c4d.

Change-Id: I2c49b044bb97a123e72070df5e83909c53e40881
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-24 12:57:14 +00:00
hjk
0e48783c03 CMake: Use buildConfiguration() instead of target()->activeBc
In case it does the same, it is faster now.
In case it does't do the same, it was something  wrong.

Change-Id: Ic3c237a9349d490bcadb10a5e9f700d68a178dae
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-02-24 12:57:03 +00:00
hjk
5c9141241b Android: Inline AndroidManager::intentName into only user
Using Target is actually not optimal as handle to access that
information (BuildSystem + BuildKey or sth to that effect would
be better), so reduce the visibility of this kind of interface.

Change-Id: I138f156b51795d51d2af49c5119d160663dfc20d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-24 12:56:41 +00:00
Miikka Heikkinen
4908055937 Integrate Edit3D view into Creator
Edit3D view is now a tab alongside Form Editor.
Buttons were moved to a Creator side task bar on Edit 3D view.

Change-Id: Ia06107e4f855ba512ffea3e628a61558894e800e
Fixes: QDS-1570
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-24 12:18:53 +00:00
Tobias Hunger
564c0c1b94 QmlDesigner: Fix annotationeditor
You need a QPointer here to avoid potential double-free. A normal
pointer is not reset to nullptr when the widget gets cleaned via
the widget tree, so if (widget) widget->deleteLater() does not
work with a normal pointer.

Change-Id: Icd352b8767b91c4ea0ad045a56857fa651f200f0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-24 11:13:11 +00:00
Tobias Hunger
d22815f208 QmlDesigner: Avoid potential double-free in FormEditorAnnotationIcon
You need a QPointer here to avoid potential double-free. A normal
pointer is not reset to nullptr when the widget gets cleaned via
the widget tree, so if (widget) widget->deleteLater() does not
work with a normal pointer.

Change-Id: I18460c44414ff2ee90d8afe3a857d5902d69f911
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-24 11:12:55 +00:00