Commit Graph

67787 Commits

Author SHA1 Message Date
Alessandro Portale
888d804826 McuSupport: Adjust Kit parameters to changes for Qul 1.1
Qt for MCUs 1.1 gets a new directory and build system structure. Sha
807a3d2 in the Qt for MCUs repository introduces the change.

This patch adjusts the parameters of the generated kits accordingly,
which means that Qt Creator (master/4.12-beta1) will from this commit on
not support Qt for MCUs 1.0.1, anymore.

Change-Id: I20ded1bc28a2ffe30b59e8bce4a17bc38bb76a79
Reviewed-by: hjk <hjk@qt.io>
2020-02-10 12:32:43 +00:00
hjk
93f722b922 ResourceEditor: Pimpl plugin
Also, do not use the plugin object as QObject parent for the editor
factory.

Change-Id: I6ab421d778fb53215a35f125753586752733b915
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-10 12:18:04 +00:00
Orgad Shaneh
835842357c ProjectExplorer: Check Shadow Build on creation if needed
Change-Id: Icd266b913e10f870dbeeccc27c362b3bb208da9b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-10 12:14:48 +00:00
Alessandro Portale
1a0af1ca22 CMake Build: Let the version dialog log link point to the repo of origin
https://github.com/<qtcreator-fork>/commits/<sha>

Instead of expecting a "%1" placeholder in the passed-in
IDE_REVISION_URL_STR, we now expect IDE_REVISION_URL_STR to be a plain
URL.

Reason is that passing a string containing "%1" from CMake to the
VersionDialog caused a premature replacement of that placeholder
somewhere on the way.

Also log the CMake configure call in build_cmake.yml

Change-Id: I4c1a946c66f891101576e3556ca87a004cead950
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-10 12:09:18 +00:00
Christian Kandeler
6627cb2f3f ProParser: Fix freeze with include loops
Make sure we exit also in inexact mode.

Fixes: QTCREATORBUG-23567
Change-Id: I5e933b9acba344fda7b7cc0ed21696b710860622
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-02-10 11:10:39 +00:00
hjk
b2ca5e4983 Beautifier: Avoid QObject parent in options page
Change-Id: I7e1162802fb6d7d7dffe143dbcdf6d85dc18d56f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-10 09:05:13 +00:00
hjk
fcafb8b482 Android: Fix Manager
Change-Id: I5ca3cda3bd64a1b4570a330f98b4b2d18b831efa
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-10 08:50:37 +00:00
hjk
9a42382fd1 Todo: Pimpl plugin and move OptionPage to new scheme
Change-Id: I75409ff14697f0edf505328e19483a4dda8f6062
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-10 08:03:53 +00:00
Alessandro Portale
8228d43579 Core: Turn the IDE revision link in VersionDialog to be Opt-in
If IDE_REVISION is set, don't default to some hardcoded string
for IDE_REVISION_IDE_STR.

Task-number: QTCREATORBUG-23524
Change-Id: Icc6aa6a4a0fb24178c5c1bd5feaa96b6a5b07115
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-10 07:56:18 +00:00
David Schulz
ce40e13e3a Editor: replace static functions with lambdas
Change-Id: I6e7c74b70e6752bbf8b030d6110a71bd5e3240c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-10 07:13:02 +00:00
David Schulz
a1e408622a Editor: reuse already collected viewport rect
Change-Id: I974837e112030b61234a8d9614ed77d834b60bd5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-10 07:12:15 +00:00
Assam Boudjelthia
f46099d21e Android: Automatically download SDK tools and essential packages
Automatically download Android SDK Tools to default path
used by Android Studio, then essential packages will be installed
using the sdkmanager tool. Automatic installation can also be
triggered by an added button in the settings page.

Essentials packages include NDK Bundle and other NDK versions
required by previous Qt versions.

An sdk_definitions.json file holds download paths for SDK Tools,
and other (Qt version <-> essential packages) combinations.

[ChangeLog][Android] Automatically download SDK Tools, NDKs and
all essential packages for Android builds.

Task-number: QTCREATORBUG-23285
Change-Id: I90e7aafecd017d2bdc959e403711d9d440a6bbb2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-07 18:21:30 +00:00
Cristian Adam
8bef0c9155 CMake Build: Fix clang binaries installation on Linux
File permissions and symlinks were not perserved.

Change-Id: Id5ba57fba2834f2297125de68af837f5d68eea2f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-07 16:32:40 +00:00
Eike Ziller
eadfe1a421 Merge remote-tracking branch 'origin/4.11'
Change-Id: Iaa3142a7109bc23c2e6ff96d061a58a9c0e31a54
2020-02-07 16:20:03 +01:00
Leena Miettinen
494838e72b Doc: Add \inmodule command to Aggregation and Aggregate docs
...to suppress QDoc warnings.

Task-number: QTCREATORBUG-23544
Change-Id: If58fe724618afe60bdc91810cec07d916844c899
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 15:15:10 +00:00
Leena Miettinen
62a2b1718d Doc: Fix QDoc warnings in ExtensionSystem class docs
Task-number: QTCREATORBUG-23544
Change-Id: I6500fefdaa919f807fa4bf4372426b19a6e57aa2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 15:12:41 +00:00
Leena Miettinen
13cd5add85 Doc: Fix errors in QrcParser and QrcCache docs
Task-number: QTCREATORBUG-23544
Change-Id: Ibd3bdd0b1aecf594b191b2ff902b38cdb335b1d4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 14:28:02 +00:00
Eike Ziller
d9d86782ce Add documentation for ExtensionSystem::invoke
Task-number: QTCREATORBUG-23544
Change-Id: I41078ef167f1dd1592cf22a69d0cad13429db201
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-07 14:27:41 +00:00
hjk
c65b02f1fa TextEditor/Vcs: Remove use of QObject parent for editor factories
Change-Id: I1b3d8b49649401c7bb03c0415f886530416afa2c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-07 14:19:37 +00:00
Christian Kandeler
3782eebfaf ModelEditor: Do not query all files in the project for their mime type
Consulting the mime type database is much too expensive to do it for all
files in a project, so take a shortcut.
Example benchmark: When loading the Qt Creator super project (with all
the commercial plugins) on my Linux machine, with this patch the time
spent in ModelIndexer::scanProject() goes down from ~8 seconds to under
300 milliseconds. Note that the UI is frozen during that period.

Task-number: QTCREATORBUG-18533
Change-Id: Id75d6bbcf37b4f4e41383a089e9e0dc5262cfbae
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
2020-02-07 14:01:06 +00:00
Cristian Adam
a478359405 CMake Build: Proper handling of clang include / binary directories
Clang needs include and binary files to be relative to Qt Creator
build / installation directory and not hardcoded to LLVM/Clang
installation on the host machine.

Change-Id: I3724cf0531305f53b31ee17b96847042e96d52d3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-07 13:30:01 +00:00
hjk
6f2beafaf2 Git: Make a few objects proper plugin pimpl members
Change-Id: Ib996ed248cd6e10d49fa3ae1086189acfc04de34
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-07 13:01:35 +00:00
hjk
eb1226df68 Git: Partially move plugin pimpl to .cpp
Same procedure as for ClearCase.
Unfortuately, some deep accesses are not easy to get rid of. Make them
available by static functions in the plugin itself. Definitely not the
favorite setup, but allows to proceed with the QObject removals.

Change-Id: Id85ed07bc7a6c1c053431a14dd7f68892f7ebea0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-07 12:56:10 +00:00
Eike Ziller
4e357e84c0 CMake build: Fix building sdktool against static Qt
On Windows. This is a hack, but enough for the purpose of packaging.

Change-Id: I308b80dcf37e26e5c69f2fd6631b4b38854d68e0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-07 12:09:56 +00:00
Christian Stenger
43c17efe5e CMakePM: Fix possible crash on exit
The pathchooser might get deleted after the inner line
edit had been destroyed already (as its ownership was
transferred to the layout of the CMake build settings
widget.

Partially reverts 314ceb13bc.

Change-Id: I3ff990af55ed08978d9f0c079c4b98a019a6ec87
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-07 11:55:58 +00:00
Christian Stenger
54cd881a40 CMakePM: Fix handling of qml debugging
Add a respective aspect to the build configuration
for handling qml debugging from the build side
similar to what we do with qmake and qbs.

Qml debugging needs to get enabled on the build side
before the settings on the run configuration page
has an effect.

Fixes: QTCREATORBUG-23541
Change-Id: I86267747601015760737d8b21978712896892a37
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-07 11:55:37 +00:00
Robert Loehning
11abdb9ddc Squish: Fix error handling
Change-Id: I896ce824a0c75d47f7b123f80937e81793cc33e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-07 11:08:42 +00:00
hjk
e9f2178a4a Qmake: Use direct access to build config from system when available
Change-Id: Ic514fb73db90f0868679d04efba62c40e28b7b59
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-07 10:55:34 +00:00
Christian Kandeler
3894dbfa65 ProjectExplorer: Make DeploymentData::addFile() do what its name says
The check that was done in there was problematic for two reasons:
    - It encoded a policy that a file could not be deployed to more than
      one target path, which might not always be true.
    - It made the function unexpectedly expensive, resulting in
      quadratic behavior for repeated calls. This resulted in noticeable
      UI lag when loading larger projects.
It's the caller's responsibility to prevent duplicates.

Task-number: QTCREATORBUG-18533
Change-Id: I33a328b14f95fe84b3c1041d4b74d645946250bb
Reviewed-by: hjk <hjk@qt.io>
2020-02-07 10:55:21 +00:00
Leena Miettinen
c42ca50537 Doc: Remove info from ExtensionSystem::IPlugin doc
Remove obsolete and duplicate info and link to overview topics instead.

Task-number: QTCREATORBUG-23544
Change-Id: Ic06cffdf08c483029caa7e42b7eb222d62be84cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 10:42:05 +00:00
hjk
b5710099bb Vcs: Make some editor factories proper plugin pimpl members
Change-Id: I7f815c53bac8621b2198c57d7f1d7d4bd43eb282
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-07 10:23:47 +00:00
hjk
a44bfdd779 Provide an empty default IPlugin::extensionsInitialized()
And remove all empy re-implementations.

Change-Id: I19f0b4e55c042c96693ecb89766f97f0a97b54ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 10:21:34 +00:00
Mahmoud Badri
76bb4e4c08 QmlDesigner: Implement grid zooming
Grid zooms in and out according to camera zoom so that grid spacing is
neither too condense nor too sparse. Also changed the grid color to be
a bit darker and few other small tweaks.
PS: if the view camera is panned, the grid will not work correctly.
This is due to issues with the camera zoom calculations and is not part
of this commit.

Task-number: QDS-1566
Change-Id: Ib08d5387b028b8d870df9ecf88a5766eae5a509e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-07 10:21:06 +00:00
Leena Miettinen
4d4a930256 Doc: Fix PluginDependency, PluginSpec, PluginArgumentDescription docs
- Add missing docs
- Fix grammar and style issues

Task-number: QTCREATORBUG-23544
Change-Id: I532d451645d1a50b2e7fabcfb879034ecfe67dcc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 10:19:17 +00:00
Miikka Heikkinen
7c992f5450 QmlDesigner: Insert a node dragged to 3d edit view into correct scene
Added scene instance id to the drop command.

Change-Id: I42df07fec823083454ad5a70ccafa318d05ab224
Fixes: QDS-1594
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-07 10:17:47 +00:00
The Qt Project
f4111fcb18 Merge "Merge remote-tracking branch 'origin/4.11'" 2020-02-07 09:41:36 +00:00
Eike Ziller
0795a5ae6f Merge remote-tracking branch 'origin/4.11'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
2020-02-07 10:41:09 +01:00
hjk
d33710a180 ClearCase: Make a some items proper data members
Change-Id: I7d1c8490ca72c6ba0b16111d2191826583037c6e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-07 09:40:15 +00:00
Christian Kandeler
96868447ce QmakeProjectManager: Make sure we reset the ProFileCacheManager
Otherwise, we can get an assertion when exiting during a parse.

Change-Id: I3a2a1fbb854662b77b2e1485a9097b9f39d94fe2
Reviewed-by: hjk <hjk@qt.io>
2020-02-07 09:40:14 +00:00
Christian Kandeler
beed0c7396 CMake/Qbs: Do not emit Project::fileListChanged()
...explicitly.
This is already done as part of Project::setRootProjectNode(), and the
signal is connected to some rather expensive operations.

Task-number: QTCREATORBUG-18533
Change-Id: I96ea2f49c866f2b60f599748c4d5b82c790ed2ca
Reviewed-by: hjk <hjk@qt.io>
2020-02-07 09:39:19 +00:00
hjk
11c242427c ClearCase: Partially move plugin pimpl to .cpp
Unfortuately, some deep accesses are not easy to get rid of. Make them
available by static functions in the plugin itself. Definitely not the
favorite setup, but allows to proceed with the QObject removals.

Change-Id: Idc1624d2a4751b15159c3e36dcf8d2d476550167
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-07 09:27:09 +00:00
Alessandro Portale
2234c517c0 Utils: Add a non-toolbar variant of the "RELOAD" icon
New icon is: Utils::Icons::RELOAD. And the toolbar variant is now
Utils::Icons::RELOAD_TOOLBAR.

Change-Id: I811d83c7340a717968430ac1ce4a5c708c8ddcf9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 09:22:07 +00:00
Eike Ziller
ee579b5bf3 macOS: Use hardened runtime when signing
Follow up of c2398e3067

Change-Id: I003f03097633202585d36a136136d84d8f3c2140
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 07:44:18 +00:00
Leena Miettinen
392690e565 Doc: Fix Utils::QrcCache and Utils::QrcParser docs
- Move class docs away from the internal namespace
- Add missing docs
- Remove \brief commands and fix capitalization and punctuation

Task-number: QTCREATORBUG-23544
Change-Id: I60440a603e73c78447fd4d923d8631debeb25116
Reviewed-by: hjk <hjk@qt.io>
2020-02-07 07:35:30 +00:00
Cristian Adam
a5178afb61 CMake Deployment: Move creation of qt.conf to add_qtc_executable
Change-Id: Icbeed128cc99b077aad925f278aaf9534d3f9fec
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-06 18:19:50 +00:00
Cristian Adam
8d767a3a21 CMake Deployment: Remove Dependencies component
- Install will also copy the dependencies.
- Made the dependencies search recursive, not just two steps
- Moved install code to a script, not having to escape quotes and dollars

Change-Id: I6c5fb19e4094e9dcd4b339d5b90be6e7c5055223
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-06 18:03:33 +00:00
Cristian Adam
decb6866b9 CMake Deployment: Fix deployment / rpath handing on Linux
Change-Id: Ic8eb8665e4ac43a49ecbf07f2a92873453c9faca
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-06 17:34:01 +00:00
Alessandro Portale
fcfb0fbf80 McuSupport: Remove Engineering packages/targets
The resulting kits are at the moment not functional. They will be revamped
as soon as the new QUL 1.1 package structure is in place, the plugin is
able to parse the upcoming meta data and when I am understanding how
exactly an engineering kit needs to look like.

Change-Id: If21bc6f5301369e4bba077faad32d934c04409a2
Reviewed-by: hjk <hjk@qt.io>
2020-02-06 17:33:00 +00:00
Thomas Hartmann
40b2b95864 QmlDesigner: Fix QTC_ASSERT
The method setTimelineRecording() assumes a valid timeline.

Change-Id: If57dac581fb14e4871745929d7f202d1e831fc40
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-06 17:18:21 +00:00
Thomas Hartmann
e68e7f723e QmlDesigner: Fix magic move offset
There is a magic offset that increases the move tool hitbox.
We should take the zoom factor into account.

Change-Id: Ib2ebb310100aa9e5ba5102e9b44d4a38f6187ced
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-06 17:18:11 +00:00