Commit Graph

66382 Commits

Author SHA1 Message Date
Eike Ziller
830a829b2e Fix build of Clang code model and CppEditor with Qt 6
QStringRef gone.
QSharedPointer is no longer auto-converted to bool.
Small things.

Task-number: QTCREATORBUG-24098
Change-Id: I3a2a55459b905118d1ca81ec015d741ab273471d
Reviewed-by: hjk <hjk@qt.io>
2020-09-21 07:21:48 +00:00
David Schulz
d99e00c49f TextEditor: allow highlightings in selections
If the selection foregound color is undefined do not overwrite the
already applied highlighting.

Fixes: QTCREATORBUG-24656
Change-Id: Ia125e8e6b9efba73d5a13facc2446a793d59f5c3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-21 07:16:43 +00:00
Eike Ziller
f8ae051816 VCS: Fix build with Qt6
QStringRef is gone.

Task-number: QTCREATORBUG-24098
Change-Id: I38dd1602294fcabf5cf7c1553bcfd93f3c47b601
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-21 06:56:58 +00:00
Eike Ziller
a1e3001fa4 QmlDesigner: Fix build with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I3d5c7d821402acc13ccd505550afc66a531b13b5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-09-21 06:56:06 +00:00
hjk
75a52875d1 Incredibuild: Use standard layout for plugin setup code
Change-Id: Ic9bbf8eb23fc4a2ed65b97e96cadcc4495ecdae6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-21 06:44:56 +00:00
Christian Stenger
7fe6fb43b5 AutoTest: Fix re-running failed data-driven QuickTests
QuickTests are not displayed inside the Tests tree which makes
marking them as failed or trying to run these tests from the
results pane impossible.
Work around by treating them as functions to re-run the whole
function instead of a single data tag if this happens.

Change-Id: I92f6403ff0e02302c52184d4403f0194226a9989
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-21 04:33:55 +00:00
Aleksei German
7d21caabdb QmlDesigner: Minor Fixes for QDS MCU compatibility
Change-Id: I401ecf9ce12d7020e78a5449b321fb7927caffed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-19 10:54:29 +00:00
Thomas Hartmann
bdbb0baa0f QmlDesigner: Fix range for "Fixed Frame" in Timeline settings
Change-Id: I71bdae7144ae91b9b8b8c8e2088b87310d2f4a2e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-19 10:13:13 +00:00
Kai Koehne
1b09888ba9 Auto Test Project: Make CMakeLists.txt file Qt 6 compatible
Change-Id: I2289c60e44e8e97de7634342de166bf299934e76
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-18 15:06:24 +00:00
Eike Ziller
6225d33c28 Fix build issues with Qt6
Change from QStringRef to QStringView at various places.

Task-number: QTCREATORBUG-24098
Change-Id: Ia7a634fa26464fbb2962724d5f0e188cecc68801
Reviewed-by: hjk <hjk@qt.io>
2020-09-18 14:41:32 +00:00
Eike Ziller
2a70bc1d09 Debugger: Fix build with Qt6
QStringRef gone.
ViewOptions changed.
MetaType register stream operators automatically.

Task-number: QTCREATORBUG-24098
Change-Id: Ibf98561af951aa5fc4ec483d18dafeaad02e07c3
Reviewed-by: hjk <hjk@qt.io>
2020-09-18 14:41:20 +00:00
Eike Ziller
3a602e8338 Replace qrand with QRandomGenerator
Task-number: QTCREATORBUG-24098
Change-Id: I91b610409a413c7d76b3c5dd43cf581a960edf7d
Reviewed-by: hjk <hjk@qt.io>
2020-09-18 14:12:23 +00:00
Christian Kandeler
73dee5fea8 Utils: Fix TextFileFormat::readUtf8()
... with regards to line separator conversion.
This fixes two C++ unit test cases on Windows.

Change-Id: I79256a574221ec83076d984b8f353bc4c0e528a9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-18 11:31:02 +00:00
Christian Kandeler
f244a7ea4c CPlusPlus: Consider member initializations
... when checking usage types.

Change-Id: Ic875f3bcae9cf045dbb062670e8cf941de533404
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-18 11:01:47 +00:00
hjk
d4c7dee48a ProjectExplorer: Use QList instead of QSet for language ids
There's no point in keeping ~2 items in a set and convert that
to a list every now and then.

Change-Id: I214b1049fb458e3d159478c47f55b97aacaac75a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-18 10:56:34 +00:00
Eike Ziller
f18d24efaa Fix crash after move to QStringView
With Qt 5. Fix the bounds checking for midView by copying the complete
logic from Qt QContainerImplHelper::mid.

Fixes: QDS-2806
Task-number: QTCREATORBUG-24098
Change-Id: I0d7d414c159f81a76114b67f55aefbb81f17b034
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-09-18 10:51:19 +00:00
Eike Ziller
7363ec8b66 sdktool: Fix build against old old Qt
Change-Id: Ifb2a368b40eceafc7839fa1abce67775e0eb233e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-09-18 10:51:08 +00:00
David Schulz
64d0043a96 cdbext: fix mingw compile
Fixes: QTCREATORBUG-24653
Change-Id: I40071a0022be809266b98e1e898e969493b927aa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-18 10:21:13 +00:00
Thomas Hartmann
4bcc371dfb QmlDesigner: Fix QTC_ASSERT
The ModelNode has to be always valid, but not the QmlItemNode.

Change-Id: I906f2f6ec101b5d19223a3b5103c81c76f2585fe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-09-18 09:58:28 +00:00
hjk
7e50cd4841 ProjectExplorer: Use LayoutBuilder in KitManagerConfigWidget
Change-Id: I271e0abc371a385d5e6ace29444ba021a38dd5d7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-18 09:57:50 +00:00
hjk
250c55f308 ProjectExplorer: Add LayoutBuilder ability to operate on QGridLayout
Also, make it possible to extend an existing layout.

Change-Id: Idcbc7ace967e575dd743c7d748f4d3b751668f7a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-18 09:55:14 +00:00
Christian Kandeler
4376bc1e39 Core: Allow different highlight colors in search result window
... and make use of that in CppTool's "Find Usages" by assigning
different colors to read and write accesses.

Fixes: QTCREATORBUG-12734
Change-Id: I067db2c8d693bb2c5be44249931ee4f0269f7e52
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-18 09:33:07 +00:00
Lukasz Ornatek
0831c07cb3 Make Translation Tests ignore imported files
Change-Id: I4abd222bd15da79a1fe14d01b8a4a1f25d935b3b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-09-17 14:50:08 +00:00
hjk
03983a2648 Qnx: Code cosmetics
Change-Id: Ibc7dc07166c79d65005d88a297916c54d30168cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-17 13:56:32 +00:00
Christian Stenger
c2d49bfa5f Mcu: Fix compile
Amends: 6400aab190

Change-Id: I0c027b4f02f9f1472f3a1b938844e9ffb8c611b0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-17 11:52:41 +00:00
Eike Ziller
897ee0e76b Fix tools/cplusplus* build with Qt6
Replace endl with Qt::endl (available since Qt 5.14)

Task-number: QTCREATORBUG-24098
Change-Id: I1a9ff2692259174c9d90612d063ca04a56285175
Reviewed-by: hjk <hjk@qt.io>
2020-09-17 11:47:54 +00:00
Christian Stenger
b74ec903a7 AutoTest: Fix construction of file paths for catch results
Using Catch2 on Windows with CMake lead to not having file information
as the file information was generated differently.

Change-Id: I3e0951b517a4a8a86f1ffa1009c1a2815565f3b3
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-17 11:35:08 +00:00
hjk
6400aab190 McuSupport: Some code cosmetics
Namespaces, spacing, connect object guards, ...

Change-Id: I64bcab14f52d990adab938ebcdef535f1c09b061
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-17 10:14:55 +00:00
Henning Gruendl
18be09f55a QmlDesigner: Fix StateEditor show event update
Task-number: QDS-2798
Change-Id: Ic27e7491012b227e144cdae68ead8ac534cc0d5a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-17 10:10:01 +00:00
Marco Bubke
fc9ad36e40 QmlDesigner: Add GridView to ListModelEditor
We could simply test for the model property but this can lead to strange
behaviour.

Change-Id: I4e326890fb02d312b5210089c957dce026a09f94
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-17 10:08:52 +00:00
David Schulz
0198aca205 Editor: set deleteStartOfLine default shortcut on mac
Fixes: QTCREATORBUG-9219
Change-Id: I26f991641efbc914d848591931756666e34c26b7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-17 09:44:09 +00:00
Eike Ziller
cf2a651c3b Make QmlJS(Tools) build with Qt5 & Qt6
Port from QStringRef to QStringView

Change-Id: I472d16f20e40ca52b8e5d481850a6bd8a1a38f3b
Reviewed-by: hjk <hjk@qt.io>
2020-09-17 09:37:23 +00:00
Eike Ziller
a749b6691e Update 4.13.1 changes with last-minute updates
Change-Id: I789f4fb10c950114ed0737dcb90460d90386e2f3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-17 09:29:22 +00:00
Eike Ziller
5ad724c61b Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Ieb1c3e946f11d3c4fa1ee6b5afdf83cc532d8aed
2020-09-17 10:28:19 +02:00
David Schulz
364288b79c Python: Fix loading working directory
Fixes: QTCREATORBUG-24440
Change-Id: I27a543f764e285acf678427cc909d2a95e5cb322
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-17 07:52:58 +00:00
hjk
0d185a0ad3 ProjectExplorer: Simplify use of AbstractProcessStep::init()
1. Systematically check for AbstractProcessStep::init() first in
   derived classes.
2. Use setupProcessParameters(processParameters()); by default in
   the base implementation.
3. Drop all re-implementations that are effectively the same.

Change-Id: I0ae54dd4909b354672a63ee56d0b7c2ea0732494
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-16 16:16:13 +00:00
hjk
9f378d41e4 RemoteLinux: Make build/deploysteps constructible by id only
Will help to remove some of the remaining hard dependencies of Qnx and
Boot2Qt on RemoteLinux.

Change-Id: I1a327249a9b2903b5b9d869cb9cd60bb50250a5c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-16 15:32:44 +00:00
Eike Ziller
b7ec9d2fbe Fix build of standalone sdktool against earlier Qt versions
We want greater compatibility for sdktool, and that rules out
QStringView. Use porting.h with Utils::StringView instead.

Change-Id: I44745f4a765c29c5e33d77d80779c79d6a5666e3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-16 14:18:40 +00:00
Henning Gruendl
b7bf3dd5fe Revert "Cannot input Korean in FromEditor/Property panel"
This reverts commit df696a34b5.

The commit breaks functionality of Controls in the Property Editor.
* No longer possible to go into edit mode by clicking on a SpinBox
* Drag manipulation is not working on a SpinBox
* Non editable ComboBox can't be opened by clicking on the value

Change-Id: I330fb96b4c72eba72a5a9716a211397dd0c6b8e9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 14:03:29 +00:00
Miikka Heikkinen
39e5d60570 QmlDesigner: Add new function to NodeInstanceView mockup
Model now uses requestModelNodePreviewImage so it's needed in mockup.

Change-Id: I9f9e43b288401de52ac010c333591c9184e10366
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 13:34:02 +00:00
Marco Bubke
df5e211d86 QmlDesigner: Fix compilation
Change-Id: Ia69deafa77ca234c9f80be10d19fcf582ab5e906
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
qds/v1.6.1
2020-09-16 13:24:27 +00:00
Miikka Heikkinen
303565fc90 QmlDesigner: Refactor modelNode preview image handling
Refactor done to avoid dependency to component core from model.

Change-Id: I8a44285fd41475e8ee1096976e8497b35a9e9b4d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-16 12:36:22 +00:00
Knud Dollereder
7b7c57f1d7 Fix mismerged build file
Change-Id: I3d07ce6717baad08d65d928ce429a47cde1a03ca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 11:08:56 +00:00
Henning Gruendl
513d1e7e02 QmlDesigner: Improve connection editor dialog
* Add ComboBoxes to connection editor dialog
* Add type toggle to dialog
* Add slots and properties to ComboBoxes
* Parse connection expression and fill ComboBoxes

Task-number: QDS-2498
Task-number: QDS-2495
Task-number: QDS-2496
Change-Id: I2cca6d4c85d1508e54d4ad8863056f22ad777ae6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 10:14:56 +00:00
Christian Stenger
7a84381a27 CPlusPlus: Fix possible crash
Text may contain special utf characters which in turn lets
the range of the token become different if handled as normal
byte. This would end up in an assert if the QStringView tries
to access a position after the last character of the text.
Amends 242579099a.

Change-Id: Ie52c15e8729f25da850b539a6a55cca134026c3d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-16 10:01:19 +00:00
Leena Miettinen
a489fc18eb Doc: Add LiteHTML license and related licenses to acknowledgments
Fixes: QTCREATORBUG-24619
Change-Id: I8d28bf8a579e8885b430cd7df292f53363990ffa
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-16 09:30:44 +00:00
Marco Bubke
7c8847333b QmlDesigner: Go into components
Task-nubmer: QDS-2696
Change-Id: I2f0ee71deea593da08fa4a754d783b53867473ed
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 08:37:53 +00:00
David Schulz
af88afe943 Debugger: Activate split that contains the breakpoint being hit
Do not change the current editor after hitting a breakpoint if we
already have an editor open in another split, but switch the focus to
that split.

Task-number: QTCREATORBUG-24646
Change-Id: Id85cecdfb522807bafa097e578509853326a2e31
Reviewed-by: hjk <hjk@qt.io>
2020-09-16 07:29:30 +00:00
David Schulz
e371eafd4b Editor: Calculate annotation color based on editor color scheme
Amends 9182d4eda7

Fixes: QTCREATORBUG-24644
Change-Id: Id34bfbc4ea3d1102835c7c1cf3afa1580dff01d8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-16 07:20:20 +00:00
Miikka Heikkinen
90d9cb36f3 QmlDesigner: Add navigator preview tooltip for materials
Request 3D preview image for material instances from puppet
to show on tooltip.

Support for effect previews is also done, but handler for it is not
registered, as effects cannot be shared between windows due to
issue QTBUG-86616.

Also refactored the preview image support out of navigator
to make it more accessible by other components.

Change-Id: Ie08ba218f929660c2e43d39578997a5a1a883efd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 07:00:06 +00:00