Commit Graph

68568 Commits

Author SHA1 Message Date
Marco Bubke
da7b83b238 QmlDesigner: Bump multi language database version
Change-Id: Icd9b379c4dfbc09a8f949c86e0354d28f6184bc7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-03-11 16:47:18 +00:00
Eike Ziller
bce64778c5 Merge remote-tracking branch 'origin/4.15'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qtcreator_ide_branding.pri

Change-Id: I009308451e1c6276692412f498125d79a8f12a07
2021-03-11 14:10:14 +01:00
Eike Ziller
e2b0547519 Merge remote-tracking branch 'origin/4.14' into 4.15
Conflicts:
	qtcreator_ide_branding.pri

Change-Id: I9d9beb7b842800ac37bc628695fb01dc91923eb9
2021-03-11 14:00:57 +01:00
hjk
3560a86c2e Debugger: Delay evaluation of stub runnable environment
There can be modifications in the environment between the decision
to use a terminal and its start. We want them taken into account.

Change-Id: I5622614c5fac3bdd8167c29e7b618b5e42a28287
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-11 12:26:54 +00:00
Christian Stenger
aa96b07853 ClangFormat: Fix compile
Amends 14eb5b382c.

Change-Id: I9bbd34d1d90d2cf27edd74037be5a3a061691456
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-11 12:11:18 +00:00
Ivan Komissarov
e2112d6831 Update Qbs submodule to the top of 1.18 branch
Change-Id: Icc28aa5ac3c222a3a1bc3c018b59cb4ef73d1f6b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-11 11:20:23 +00:00
Leena Miettinen
8f68cb9e75 Doc: Fix broken navigation link
Change-Id: I188d989380d51d993e00dab3f5ca6fe790e33ef2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-03-11 10:31:16 +00:00
Christian Stenger
2b5f7316ac Tests: Work around problems in execution of dumper tests
On several machines the QDir test interferes in a not yet known
way and makes all following tests fail. Moving it to the end
makes the problem vanish.

Change-Id: Ic8e7fdaaf9581be0cdd5666c7d2f12a2e8ed80ee
Reviewed-by: hjk <hjk@qt.io>
2021-03-11 09:05:04 +00:00
Alessandro Portale
ac5bffc1e4 More bumping of the Copyright Year to 2021
Also for the qmake and qbs based build systems.
Amends: 0af4f5152e

Change-Id: Ifcf1730d7b2b28dd9582d5b3569f50e3b7c91e07
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-11 08:48:12 +00:00
Björn Schäpers
14eb5b382c clangformat: Fix build with LLVM 13
Change-Id: I5eaad17a6f240aa1e3f246492b69f093b4f59fee
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-11 07:50:30 +00:00
Eike Ziller
8ac091abf8 CMake: Improve layout of "Apply configuration changes" dialog
Show the CMake parameters that would be passed in a mono space font, one
option per line.

Change-Id: I462792736960b33fea669b5b753c89d21cd087fd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-11 07:47:01 +00:00
Christian Stenger
f0004333b2 PE: Fix expectations of LinkSpecs test on Windows
The output parser detects Windows paths on Unix differently which
makes the format differ from the one that is generated on a
Windows host.
Beside this remove BOM from msvcparser again and do not perform
the format check if there is no expected format specified.
Amends 9e4e9924ad.

Change-Id: Icb0d292a8908cdd2f86b13fde6d2d287f3a96dd6
Reviewed-by: hjk <hjk@qt.io>
2021-03-11 07:09:26 +00:00
Eike Ziller
b6164e7b72 Merge remote-tracking branch 'origin/4.14' into 4.15
Conflicts:
	cmake/QtCreatorIDEBranding.cmake

Change-Id: I70c4cc83197f089e5d92303a6d434fe28d63a187
2021-03-10 17:41:34 +01:00
Alessandro Portale
0af4f5152e Bump IDE_COPYRIGHT_YEAR to 2021
Change-Id: Iadb0f2618b02cd9f36366d718d50be7efcb5f679
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-10 16:38:32 +00:00
Erik Verbruggen
9d90efee8b Add QML import path supplied by the kit
Although QUL has merged the QML import paths and the include paths, the
convention for C/C++ is to have the headers for a project under a
subdirectory of the include path, and do imports relative to the include
path. For example:
  #include <qul/SomeHeader.h>

The QML code model doesn't know about this convention, so for the kit
has to supply an extra QML import path for this case.

Change-Id: I82d4375dd8a1f510180f81b011a715dee8c10d60
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-10 14:33:06 +00:00
Alessandro Portale
50c0f0952d QtSupport: Use native dir delimiter in "Link with Qt..." button tooltip
Change-Id: I5b8def5abb16c965e5bec4ddd7b71e11fe4d9e57
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-10 13:17:02 +00:00
Alessandro Portale
95d8734e5f SdkTool: Print out "Based on Qt " << qVersion()
Since the SDK setup tool may be built against a different Qt version
than the IDE is that incorporates the sdktool, it makes sense to print
out what Qt version was used.

Change-Id: Icd7ec25d261b8394c80b11aa317fd394b92f11b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-10 11:26:17 +00:00
Eike Ziller
a3b537ad39 CMake build: Disable FakeVim and building with PCH with Qt 6
FakeVim does not compile on MSVC because Qt 6 doesn't like
meta types that are recursive maps with keys that have a custom
operator==.
Building with PCH has different issues on macOS and MSVC.

Change-Id: Id1b9580f7347f1c8facade67fd74532a023af41f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-03-10 10:40:04 +00:00
Cristian Adam
99dd3a0260 CMakeProjectManager: expand variables for Batch Edit
The Batch Edit dialog is offering the ability to use expanded
variables, but these variables were not expanded upon acceptance.

For the CMake command line they were expanded, but there was a
conflict between what the settings dialog as value had and what
CMake returned via file-api.

Change-Id: Ia4a64e99676c43f7b182e059f9051393aa184c19
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-10 10:30:03 +00:00
Cristian Adam
f7d729f0b5 CMakePM: Treat empty build as empty when importing CMake builds
Qt Creator 4.15 with the CMake multi-config support it parses the
correct CMAKE_BUILD_TYPE file-api json export.

With the empty build Qt Creator was giving it a name: Build, which
was not part of the file-api json export.

Fixes: QTCREATORBUG-25387
Change-Id: Id0b5f1077f6473fa5aef09397a8257b253557597
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-10 10:29:55 +00:00
hjk
9943146cfe Debugger: Introduce an option to force QT_LOGGING_TO_CONSOLE=1
Debug output is ephemeral in nature, and does not belong into system logs.
It happens, however, on Arch. Let people override this.

Fixes: QTCREATORBUG-25421
Change-Id: I5686e256d76e5a127e3269c5f407daf39bad683f
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-10 09:59:02 +00:00
Leena Miettinen
47b569afa6 Doc: Add a separate topic for the States view
Replace occurrences of "item", "object", or "type" with "component"

Task-number: QDS-3771
Change-Id: I92a78c0a714615cd51ada5459a9f4c1722103abd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-10 08:56:44 +00:00
Leena Miettinen
706b9ceedb Doc: Restructure information about Connections View
- Add a topic that summarizes the Connections View tabs
- Hide some technical detail in the instructions
- Make "Adding Connections" a collection topic
- Fix terminology to use "component" instead of "object".
  "item", or "QML type"

Task-number: QDS-3771
Change-Id: I0b0d66cb50d8ecc7dbc812ef57918ffafb64cd8c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-10 08:56:33 +00:00
David Schulz
4b1bb9c0fc CppTools: Fix highlighting angle brackets
Change-Id: Id7ee6a13d34799aba46bd9a8005a925f745cf53a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-10 05:10:51 +00:00
Bernhard Beschow
9e4e9924ad ProjectExplorer: Unit-test LinkSpecs of tasks
Change-Id: Idc86c8fcb9a915490e4a67beb7a057672096861f
Reviewed-by: hjk <hjk@qt.io>
2021-03-09 23:25:29 +00:00
Eike Ziller
f176a6f530 Wizards: Fix error message if project name is empty
It showed "The project already exists" instead of "Name is empty".

Probably broke with 8d1a592d16

Fixes: QTCREATORBUG-25398
Change-Id: I0cbe5753d80bc30c93408886668e39278d99c97f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-09 17:23:38 +00:00
Eike Ziller
ed3e2fb8a5 More changelog for 4.15
Change-Id: Ia10c90d6c5ee941087df3deb8cfc1c65b542132a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-03-09 16:52:14 +00:00
Thomas Hartmann
76be73b157 QmlDesigner: Trim state name
States should never have trailing white spaces.

Change-Id: I67dc08e12fa042a237ede3d2d0247e6ea2b55eff
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 15:29:25 +00:00
The Qt Project
01be3816f9 Merge "Merge remote-tracking branch 'origin/4.15'" 2021-03-09 14:33:44 +00:00
Thomas Hartmann
fd763dd60b QmlDesigner: Return action by id
Change-Id: Id1d15acf513786789c4ea4deaa84672f17fd889b
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 13:34:19 +00:00
hjk
60c26a4993 Debugger: Use LayoutBuilder for AnalyzerRunConfigWidget
Less noise.

Change-Id: Ieeb853d8bb3661582e7cda275f7c420b8246a046
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-09 13:06:02 +00:00
hjk
641604429a Debugger: Use an aspect for the source path mapping
More in line with the other settings.

Change-Id: I86494f1955120cddda7d2f2eec8ba0fdbfd99585
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-09 12:40:12 +00:00
Miikka Heikkinen
6deac5593c QmlDesigner: Fix infinite loop on item library resize
If item library width goes to somewhere between 50-100 pixels
(around the width of a single item), QDS gets stuck in infinite loop.
It's unclear what exactly causes this loop, as it seems to be deep
inside QtDeclarative, so worked around it by enforcing 100 pixel
minimum width for item library.

Change-Id: Ib1193cce760098edd0df61177058f134f406101e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-09 12:33:24 +00:00
Leena Miettinen
857ffe457c Doc: Restructure information about Timeline view
- Add a new topic that describes the view, toolbar buttons,
  keyframe track icons, and context menu commands
- Add a link to a video about using the Timeline view
- Move Curve Editor info to a separate topic
- Move Easing Curve Editor info to a separate topic
- Update information about specifying Timeline Settings
- Update terminology to use "component" instead of "item" or "type"

Task-number: QDS-3771
Change-Id: I768aa171a6de962b65b1bdc7842cdd8d004b1e69
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 12:33:20 +00:00
Eike Ziller
6371fa23a6 Merge remote-tracking branch 'origin/4.15'
Change-Id: Ia0cf8d72871437386bf8ad16a8e101bd9d97cc73
2021-03-09 13:17:52 +01:00
Thomas Hartmann
84800e8113 QmlDesigner: Forward QT_IM_MODULE=qtvirtualkeyboard to puppet
If QT_IM_MODULE=qtvirtualkeyboard is used for the application,
when we should also set it for the puppet.

Task-number: QDS-3859
Change-Id: Id88132cebbb7aeddb3fbb8ff1e8aa5191cc89d15
Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 12:11:37 +00:00
Eike Ziller
834b6c2da1 Merge remote-tracking branch 'origin/4.14' into 4.15
Change-Id: I9b4f24456b94381fb7427d60bd683069edf31360
2021-03-09 12:44:12 +01:00
hjk
cb55af8e55 Utils: Replace BaseAspect::setVisibleDynamic by setVisible
This was a workaround from a time where BaseAspect didn't know about
subwidgets created by derived aspects. That's not the case anymore.
Subwidgets registered with registerSubWidget() get their visibility
adjusted by BaseAspect::setVisibility() nowadays.

Subwidgets not registered with registerSubWidget() should not exist.

Change-Id: I8cdf72e5ea1f93c519f606913e084c78afecb56f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-09 11:30:10 +00:00
Michael Winkelmann
98ab3af2a8 Annotation: isEmpty const
Change-Id: I95f1c275c7190f27e0ac2c1a57eb791c9353d4c8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 11:24:10 +00:00
Jarek Kobus
675a72e296 Fix a deadlock when closing Creator while loading a project
Replace the call to SynchronousProcess::run() by asynchronous
call that invokes a process.

This change may be tested by applying the additional patch
mentioned in QTCREATORBUG-25385 description.

Don't call the SynchronousProcess::run() from the main thread when
the Quit event was already scheduled for qApp, since the Quit event
will get removed from the awaiting queue by a call to
QEventLoop::exec().

Fixes: QTCREATORBUG-25385
Change-Id: I8af39552443bfa9b3af6e31ddce85a01b91bbbd8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-09 11:13:01 +00:00
Miikka Heikkinen
2de66272e8 QmlDesigner: Fix item library header
Title text of tab buttons no longer overlaps the plus sign.

Fixes: QDS-3842
Change-Id: Iec51ebf00e6f719eac8b7204634ae8dc7696939a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-09 10:53:12 +00:00
Mahmoud Badri
af41cca569 QmlDesigner: Move new item lib qmls to the share folder
...so that theming and hot reloading can be applied. Theming isn't part
of this commit. Also used icon font instead of pngs.

Change-Id: I7df149fe9c07fb4c2e3deca6bcf3b0346025e3d6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Miina Puuronen <miina.puuronen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 08:58:14 +00:00
Marco Bubke
a6f944e472 Sqlite: Use emplace_back instead of push_back
It does not only removes code it should be even more optimal.

Change-Id: I819a7300ca798c3109b20c1e3bafcd19078faebd
Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-03-09 08:58:05 +00:00
Marco Bubke
5c459be526 QmlDesigner: Add Model::bindingPropertiesAboutToBeChanged
It is sometime quite useful to know the old value. For example to remove
it. We could add add the old values to the bindingPropertiesChanged but
this would be a much larger change.

Change-Id: I9b4a78602a35766c99092892b61173fc5c439978
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-03-09 08:58:00 +00:00
Marco Bubke
00cec8a688 QmlProjectManager: Bump up version of the multilanguage database
Change-Id: I123171475f6d37241fdbe37c94725df718f5fe9f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-03-09 08:57:53 +00:00
Marco Bubke
20690236d7 Utils: Add iterator constructors to small string
Change-Id: I34e15177268f0733200d25c90fd935485c3176ae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-03-09 08:57:30 +00:00
Tuomo Pelkonen
dab168fa81 QmlDesigner: Fix flow editors decision items selection area
Decision item must only be selectable from the item, not the label text. Text can
overlap with other items and selection becomes unnatural if it is included
in selection bounding rectangle.

Task-number: QDS-3747
Change-Id: Ic5697f124cd0210f6af00b3c004ea19d0af2cd91
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 08:46:53 +00:00
Tuomo Pelkonen
29307b7b15 QmlDesigner: Improve in-place Text element text modification
When double-clicking Text -element, check if the text is rich text or not.
In case of rich text, show a rich-text editor modal dialog
In case of plain text, show a in-place LineEdit with correct font

Task-number: QDS-2306
Change-Id: I5206c7d6c869e26ad39979106510d72626dbe800
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 08:46:46 +00:00
Tuomo Pelkonen
8e7a3ae4a6 QmlDesigner: draw FormEditorItem bounding rectangle
Draw red rectangle around FormEditorItems
Optimize drawing using square root based sizes

Task-number: QDS-2241
Change-Id: Iedd11b7e50f23e2d8c5a26ad5f7da62756ad426e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 08:46:43 +00:00
Christiaan Janssen
b5781e6028 McuSupport: Improvements with version detection
Task-number: QTCREATORBUG-25261
Change-Id: I1b378eb4a4d132b64e4c36e0a0cdafd402570785
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-09 08:31:16 +00:00