Commit Graph

67787 Commits

Author SHA1 Message Date
Cristian Adam
bafa0d9495 CMakeProjectManager: Add elapsed timer
Change-Id: I1e7bcd60cae0193b4d16f20175b76550aaefbf9c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-28 12:33:13 +00:00
Leena Miettinen
85bcef044c Doc: Fix typo "fil" > "file"
Change-Id: Iaa0f25c9ef0c76f2923f91354304e3b0c6bb78b1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-28 12:04:42 +00:00
Leena Miettinen
fb185eef11 Doc: Update screen shot to show the list of locator filters
Change-Id: If6b4068676e994ce5ec684432983df3f173dfab5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-28 11:57:45 +00:00
hjk
fbd1574a85 ProjectExplorer: Fix use of build step list preamble messages
The step list names are computed separately anyway, having an
extra preamble consisting of concatenated build list names on
one line looks unnecessary.

Change-Id: If754c6363042927210dfd09c23f2f494081f8c47
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-28 11:48:35 +00:00
Assam Boudjelthia
94a9528156 Android: deduce the NDK path of saved toolchains from compilerCommand()
The change 290840, made AndroidToolchain tied to an NDK location, but
when restoring a toolchain the NDK wasn't being assigned. This deduces
the NDK location from the toolchain compilerCommand().

Change-Id: I3cd936ac48570fadbec15ac1e13496706718c0ea
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-28 11:42:43 +00:00
Assam Boudjelthia
351f39fb3b Android: fix sdkmanager duplicating packages list
It seems that forcing sdkmanager reloadPackages is causing a duplication
in all packages and ndk listings.

Change-Id: I7e92d1c6dcec2a09db088d9596aca31a3d8b437f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-28 11:42:28 +00:00
Jochen Becher
e7784b592d modeleditor: Add icon name to object outline for intersection
Change-Id: I09b65a675e4d2205d0be2b1ca1687f2ceffe4285
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-28 11:42:14 +00:00
Orgad Shaneh
ba87fb2083 Git: Add actions for changes in output window context menu
Change-Id: I5aa46f87b82670286ac225d71a3a045133976e86
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-28 09:53:51 +00:00
Orgad Shaneh
ab3e2ac0fc VcsBaseEditor: Fix tr context for Copy action
This amends commit 7677e3e197368bd206dc565368cb3f33d951d092.

Change-Id: Ib07dc2a8110a8e09f43c035989d9ffa84e0427d3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-28 09:44:55 +00:00
Orgad Shaneh
a01035fefb VcsBaseEditor: Highlight default actions on context menu
Change-Id: Idc493658dbc829394bd2898a59ba5686036bc3fe
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-28 09:39:14 +00:00
Leena Miettinen
a8c9d394fd Doc: Replace "Qt Bug Tracker" with "Qt Project Bug Tracker"
Add links where they were missing.

Change-Id: I218c1160226ec5223e6bd055d73e82092f254792
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-28 09:30:42 +00:00
Leena Miettinen
d119258c9d Doc: Describe new help options
- Only latest docs are registered by default
- Users can change the settings for displaying help in
  the detached help window

Change-Id: Id7efb98e11eb8a27b7d01422e65ac63b860c868e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-28 08:58:56 +00:00
David Schulz
0776340ad8 Dumper: unify Codestyle
generated with autopep8 and the introduced setup.cfg

Change-Id: I5b55a7937f2cde81be59d2b434e94ada1a4af5ab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-28 08:35:05 +00:00
David Schulz
8940522fe2 Core: calculate highlight scrollbar margins at compile time
Change-Id: I9ce008c438f888df1c7f97df5ccb1868705e0636
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-28 08:34:31 +00:00
Leena Miettinen
ae98f91f1b Doc: Update info about finding with the locator
- Describe the new bug filter
- Describe the new URL template custom filter type
- Update screenshots

Change-Id: I830b3953e89e97a7e5a405687915b67153412d9a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-28 08:10:00 +00:00
Orgad Shaneh
d9ca238ffe VcsBaseEditor: Remove default actions when right-clicking a reference
Change-Id: I2e8abd4487756be2535934ca8ab4d6b9105e6088
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-28 07:06:49 +00:00
Orgad Shaneh
9455b144b2 VcsBaseEditor: Remove unused functions
Change-Id: Ida1df50aee0c146d8070e62292163d34cd53f65a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-28 07:02:44 +00:00
hjk
488bd7eddb CMake: Check parseGuard.guardsProject()
... before overwriting the current guard, retaining the
state of the current guard in the error case.

Change-Id: I45ec43d48a9a13b9b59a5bbe6415a457b974b654
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-27 16:27:34 +00:00
Fawzi Mohamed
a670e203b1 Ensure that null dereference in test is not optimized away
Change-Id: Icf8eb894a8277353448f46b18d5d6614be1d2350
Reviewed-by: hjk <hjk@qt.io>
2020-02-27 16:08:09 +00:00
hjk
b3ca796d97 Qmake: Use buildableFileProFile(node) for Build File action
Should be at least theoretically the right one, but is mainly
done to always feed a QmakeProFileNode * to the 5-args
handleSubDirContextMenu().

In practice it does not seem to impact the current level of brokenness:
In case of Build->File with not-synchronized editors the action shows
the name of the file selected in the project view, while it actually
builds the file in the current editor.

Change-Id: I47f8f22eb80be18d1be5997a861cea89bd069d1b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-27 15:54:41 +00:00
Eike Ziller
956fd44c3e TextEditor: Improve splitting top/bottom
If the text cursor is visible, but in the bottom area of the editor, it
would be no longer visible after splitting. That makes the probable
"area of interest" vanish from sight.

Check that condition (visible before, but would not be visible
afterwards), and if that is the case center the text cursor in both
resulting editors.

Change-Id: I8c8dccd2d9db439c82d0aca34b8ef99fa97aa48e
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-27 14:25:58 +00:00
Christian Kandeler
bd03041428 QtSupport: Prevent misleading message about ABI mismatch
MSVC 2015/17/19 are ABI compatible, but BaseQtVersion::validateKit()
would emit a warning when using e.g. a Qt MSVC 2017 build with an MSVC
2019 toolchain.

Change-Id: I50ba026ae7b55e052b26826076ef962f369a05a1
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-02-27 14:21:06 +00:00
hjk
a84e626b67 ProjectExplorer: De-QObject-ify ToolChainFactory
As collateral damage, use a capital C in  KeilToolchain*.

Change-Id: If9d64de2108366546683144975d975d9d1727712
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-27 13:58:24 +00:00
Christian Kandeler
bcc2b5e08d "New Class" wizard: Try to find a base class header
If the project has a header file whose name suggests that it might
declare the base class, then add an include statement for it.
While we cannot guarantee that the include statement is resolvable as-
is, it's at least a basis for the user to adapt accordingly, while
without any include statement the class will definitely not compile.

Fixes: QTCREATORBUG-3855
Change-Id: I55ec43d58a9a13b9b59a5bbe6415a457b974b654
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-27 13:28:23 +00:00
Leena Miettinen
171ad62aed Doc: Describe linking Qt Creator to a Qt installation
... for sharing auto-detected Qt versions and kits

Change-Id: Ie0063b0a66a58508bb848b2b8fb4b29cadc35c26
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-27 12:07:04 +00:00
Leena Miettinen
5278f69851 Doc: Fix typo "ajust"
Change-Id: I6a974dc9e9f9439392cf8029740fe72415f80e54
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-02-27 10:03:58 +00:00
Eike Ziller
0585ad0f64 Merge remote-tracking branch 'origin/4.12'
Change-Id: I4523ea36332772a310fd462df55683c93c61bb18
2020-02-27 09:41:05 +01:00
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