Commit Graph

63610 Commits

Author SHA1 Message Date
Eike Ziller
56d2dab5fe Merge remote-tracking branch 'origin/4.11' into 4.12
Change-Id: I7e526857a4d9e63838f76d5e3fbb0db7287d5617
2020-02-27 09:35:11 +01:00
Cristian Adam
18386c7117 CMake Build: Fix yaml-cpp include directory detection
On Ubuntu 19.10 the libyaml-cpp-dev CMake config module has a broken
value for YAML_CPP_INCLUDE_DIR.

Change-Id: I5097ef656b988dda0326a15b521b92cbbdb0a390
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-26 17:47:29 +00:00
Leena Miettinen
da5d53b89b Doc: Document the Restart Now button that appears when needed
Typically, when users enable or disable plugins.

Change-Id: I1d9588e662613d6c061756d247bf12f7c1ace4ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-26 16:15:21 +00:00
hjk
07fae31f3c ProjectExplorer: Fix BuildSystem::disabledReason
Inverted logic.

Change-Id: Ie2decba4724dc663cfeb84d4d8be58319c9443ad
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-26 14:58:22 +00:00
hjk
8cd145b32f ProjectExplorer: Remove RunConfiguration::activeBuildConfiguration
Only used once, and the concept is undesirable.

Change-Id: I7f28f8a20d6d1f003a6d8b18bbcfba343614625c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-26 14:51:56 +00:00
hjk
5b87681366 ProjectExplorer: Remove some unused BuildManager signals
Change-Id: Iea832e96b726db9b93c235a57d6285337df7734d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-26 14:45:44 +00:00
hjk
df7400b686 ProjectExplorer: Disentangle ProjectExplorer::updateRunActions
This enforces a linear pass through

  [static] ProjectExplorerPlugin::updateRunActions
  ProjectExplorerPluginPrivate::doUpdateRunAction
  [emit] ProjectExplorerPluginPrivate::runActionsUpdated

instead of the previous direct emission of the signal from
user code and connecting also the internal update to it.

This is meant to simplify reasoning about execution order and
maybe to help elimimating double executation.

Change-Id: Id8cc41a46d9dec06afb5514855f2ae80560f3695
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-26 14:32:58 +00:00
hjk
4672013595 QmakeProjectManager: Merge QmakeManager into QmakeProjectManagerPrivate
No need for two manager type classes talking mostly to each other.

Change-Id: I82a52385df08dc4cddac2d294661341a79b86a4d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-26 14:26:28 +00:00
Leena Miettinen
4a9dc144f0 Doc: Remove duplicate file
This file has been moved to \doc\qtcreator\src\...

Change-Id: Idaf18e7113f8af9e4054682872eaefc419dc63fc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-26 14:15:28 +00:00
Eike Ziller
c912ee6862 TextEditor: Fix scrolling state after splitting
And when restoring editors in other ways (like from a session).

When splitting, the new editor was always scrolling to make the text
cursor visible, even if it wasn't visible in the original.

1. open editor with long contents
2. scroll away from the text cursor, so the line isn't visible
3. split and wonder

or 3. close and re-open Qt Creator, and restore the session

Our code already does set the state of the new editor to the old one,
but that state was destroyed by QPlainTextEdit::showEvent, which scrolls
on first show if text was added to the document.
So, wrap the showEvent with save/restoreState on first show.

Change-Id: I95e0b4e963ebb33d13ce020affaf7fc7f94c9257
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-26 14:12:01 +00:00
Leena Miettinen
8b5934900c Doc: Describe using custom fonts in Qt Quick Applications
Developers can use custom fonts in Qt Quick UI projects that they
create in Qt Design Studio. Additional steps are needed when
converting these projects to Qt Quick Applications.

Fixes: QTCREATORBUG-23646
Change-Id: Iebc8e6efd9683450232d1ea878925f9791536663
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-26 14:11:54 +00:00
Henning Gruendl
9684a5f269 QmlDesigner: Integrate upstream commits
- Integrate the newest commits from the base repository
  dec170ed24679fd49f9fb54af91f61146838f852
  34cb2ae91790fc65ca5c0f7b81bb928de22a32e5
- Cleanup a few if statements
- Cleanup a comment

Change-Id: I158bff610f701e7a30680cfb8383f64475199bbe
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-26 13:59:57 +00:00
Henning Gruendl
3749979ba8 QmlDesigner: Fix compile for Qt5.13
Change-Id: I963997432e643d7e7ca5d4ddc2419534191d3c36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-26 13:59:37 +00:00
hjk
2cd44a546f ProjectExplorer: Inline RunConfiguration::isActive
... into the only internal caller.

The use there is dubious to some degree.

Change-Id: Icfa7437b3fdaa4dbd73fe9965a88abf4700cd3e0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-26 13:56:35 +00:00
Cristian Adam
be2da106ee Utils: clean up CMake code
Re-use an existing variable, which contains the same information.

Change-Id: I1daa6428d67f11dd2efccd43ff6bab76420236ae
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-26 12:52:34 +00:00
Alessandro Portale
3a52269a1d scripts: build.py: Handle Null path in default_python3()
Change-Id: Ice6b269502a77f31a7af447429bba4332df026e9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-26 12:00:48 +00:00
Assam Boudjelthia
c3c5708741 Android: make sure old autodected toolchains are marked as autoDetected
Some toolchains that were auto detected in previous sessions or version
of Creator might re-appear as manual toolchains. Thus, make sure that's
fixed. Also, make sure the name of old toolchains is updated with the
current name format.

Change-Id: I04d2145cb9c5e1e25e2bcbc21c014280bc355195
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-26 11:59:01 +00:00
Christian Kandeler
a3635a697b ProjectExplorer: Prevent telemetry collection by VS command-line tools
Apparently, recent Visual Studio installations try to collect temeletry
information via powershell in vsdevcmd.bat, which interferes with our
toolchain setup process. Turn this behavior off.

Task-number: QTCREATORBUG-20886
Change-Id: Ia81652fc721119980da980c043991df27f10a10f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-02-26 11:58:46 +00:00
Cristian Adam
4e058a10b4 CMake Build: Fix linking PythonPlugin in Debug mode with MinGW
PythonPlugin depends on LanguageClient, which has a private
dependency on LanguageServerProtocol.

This fixes this error:
src/plugins/python/CMakeFiles/Python.dir/pythonrunconfiguration.cpp.obj:
In function `int LanguageServerProtocol::JsonObject::typedValue<int>(QString const&) const':
src/libs/languageserverprotocol/jsonobject.h:134:
undefined reference to `__imp__ZN22LanguageServerProtocol13fromJsonValueIiEET_RK10QJsonValue'

Change-Id: I7cacbf68a00ff9ff2a6ab9618bc6ec371247a0aa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-26 11:57:11 +00:00
Cristian Adam
82b6de6db6 CMake Build: Add qtdiag to Dependencies install target
Change-Id: If1c56ff6e366ec4d5c4bb97e4a176cf9cf8dc4c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-26 11:56:32 +00:00
Thomas Hartmann
e7ca8fbee4 QmlDesigner: Allow bigger size overrides in form editor
Task-number: QDS-1714
Change-Id: I12e01c5bab54ce4f796df48252709027446dd781
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-26 11:35:25 +00:00
Robert Loehning
29ab2d3644 Squish: Break endless loop in tst_CSUP06
Change-Id: Id0762128a9c2b6b3cc15684ff1b35c38b3a64c97
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-26 11:07:56 +00:00
Orgad Shaneh
f15d6d0baf VCS: Set repository for VcsCommand
Makes file names right-clickable.

Change-Id: I96ba21e73d54819148f13fcb033a144146b00418
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-26 10:56:52 +00:00
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