Commit Graph

47434 Commits

Author SHA1 Message Date
Alexander Mishin
229dfaab95 Add qmlImportPaths property to .pyproject file
Users should be able to add custom QML import paths for
Python/PySide2/PyQt5 projects in Qt Creator in order to
get syntax highlighting and code completion for custom
QML modules.

Fixes: QTCREATORBUG-23679
Change-Id: Iec7c691c4b8709c48a790cd27ac7c6e755967796
Reviewed-by: hjk <hjk@qt.io>
2020-09-22 13:43:21 +00:00
Miikka Heikkinen
31ec38dba5 QmlDesigner: Add navigator tooltip for 3D Components with Node root
This enables showing preview tooltip for all imported 3D models.

Also moved the preview image handling out of the model and into
NodeInstanceView, where it fits more naturally.

Change-Id: I48135d06aa8d9313525dae618e22692563da78fd
Fixes: QDS-2807
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-22 13:35:20 +00:00
Miikka Heikkinen
762addfbd0 QmlDesigner: Add navigator tooltip for 3D Model nodes
Only the source and geometry properties of the model is taken from the
node, rest of the properties are always same for consistent style.

Change-Id: I2355ce91c3e3d6f23b9f27ecf31430e3e13d0c80
Fixes: QDS-2764
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-22 13:35:10 +00:00
Eike Ziller
6fe11f80d6 Export QmlDesigner plugin directory for use by plugins
Change-Id: Idf46c28aa9c6b4a4c9ae6a097a598abf7cf8b6c4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-22 12:29:23 +00:00
Andre Hartmann
2921b94785 QtTestParser: Fix switching back to Status::NotHandled
Every Application Output occurrence of

 "FAIL!  : test1::test_case1() Hi there!"

made the QtTestParser handle all subsequent lines until
the platform depending closing pattern

 "   Loc: [../Test/tst_test1.cpp(13)]" (UNIX)

or

 "..\Test\tst_test1.cpp(13) : failure location" (Windows)

was found. If that pattern did not follow, or if the
wrong platform pattern followed, all subsequent lines
were not handled by other output parsers.

Fix that by returning NotHandled if the locationPattern
does not match one of the next lines after the triggerPattern
(only actual/expected lines may appear in between).

Fixes: QTCREATORBUG-24353
Change-Id: If28af6738d6b01751c0c916d1a5d8a31dcea9ff4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-22 10:46:32 +00:00
Eike Ziller
fd5f0e6819 Remove Core::Id
Moved to Utils in 4.13, and the compatibility typedef is ugly.
Remove it now.

Change-Id: I0d80165b427448eaf7ee6cc1c0a6a34a85b7083b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-22 09:47:56 +00:00
Jacek Nijaki
08541305b6 McuSupport: Add support for desktop backend JSON file
Starting from Qul 1.5 json kit file will be shipped for desktop platform.
This change is backward compatible with previous Qul version - if no
desktop specific json file is found a legacy code is executed.

This change removes "desktop" toolchain, instead "msvc" and "gcc"
toolchains are introduced.

Additional parameter was introduced to the josn kit file: "platformName"
which enables using different strings in kit name and in QUL_PLATFORM
cmake variable.

Change-Id: Ie0a212aaad47a8033e9a81467f60a23c2bc19a51
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-22 08:32:00 +00:00
Eike Ziller
5cb5d8e585 Remove usages of Core::Id
It moved to Utils.

Change-Id: Ia4d12bb07db2d59b1cb084b2ebdea20e6e3b40ad
Reviewed-by: hjk <hjk@qt.io>
2020-09-21 13:06:21 +00:00
Kai Koehne
71e2138517 Fix copyright/license of vcsconfigurationpage.cpp
The copyright and license was changed as part of the 397e7f48
mass change, arguably by erroneously copying it from
imageviewer/imageview.h or imageviewer/imageview.cpp.

Fixes: QTCREATORBUG-24620
Change-Id: I1f6a631c3b0a437af862d929a921693db367cef2
Reviewed-by: Denis Mingulov <denis@mingulov.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-21 12:33:35 +00:00
Kai Koehne
87cf6400fc ImageViewer: Change license of files to Commercial/GPLv3
Task-number: QTCREATORBUG-24620
Change-Id: I8c76b312d4e93346ca70eec92b8b7ac8dfa455d1
Reviewed-by: Denis Mingulov <denis@mingulov.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-21 12:33:29 +00:00
Christian Kandeler
781a4484a1 ProjectExplorer: Remove replacement kits
... for which the original kit has turned up again. Otherwise we'd have
more than one kit with the same id.

Fixes: QTCREATORBUG-24589
Change-Id: I7ce16615694d3d2c5a5441f676ecb7dc85c2239c
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-21 11:57:03 +00:00
Eike Ziller
3f42c989ee Fix Qt 6 build of ProjectExplorer and targets & build systems
QStringRef is gone.
qsizetype vs int.
QMultiHash::insertMulti is gone.
QXmlStreamWriter writes UTF-8 by default.

Task-number: QTCREATORBUG-24098
Change-Id: Id217e40a1f17993a84fc725976e9cb84618b0580
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-21 11:31:54 +00:00
David Schulz
c8a3571426 Snippet: show mangled replacements in snippets tooltip
Fixes: QTCREATORBUG-24317
Change-Id: Ibaeacc13f49a933836ccf9c906309219e3533564
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-21 10:36:47 +00:00
David Schulz
da2e8bbf7b Editor: fix hanging when using invalid printer page rect
Some printer seem to return an empty page rect for some configuration
which results in an invalide page count and a freezing ui. Do not print
anything and return in that case.

Fixes: QTCREATORBUG-24110
Change-Id: I42349bc97734e3f6a67502482d2b02959e865665
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-21 10:18:29 +00:00
Thomas Hartmann
3ca54e7da7 QmlDesigner: Add unique ids for the toolbar action of TransitionEditor
Change-Id: Ibb73da4655f55023c7e1e61226d33c586d9a9099
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-21 09:35:50 +00:00
Thomas Hartmann
e12aefa33a QmlDesigner: Add menuIds to TransitionEditorActions
Change-Id: I33c94e99404952c461cd548cce2e741a496de538
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-21 09:35:38 +00:00
Henning Gruendl
485c3c25ac QmlDesigner: Add reverse item order in navigator
Extend drag and drop, move and reparenting buttons to take into account
reverse item option.

Task-number: QDS-2773
Change-Id: I755e233511567c12d171245efbdca4044e896ba2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-21 09:17:04 +00:00
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
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
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
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
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
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
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
Marco Bubke
df5e211d86 QmlDesigner: Fix compilation
Change-Id: Ia69deafa77ca234c9f80be10d19fcf582ab5e906
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
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