Commit Graph

47434 Commits

Author SHA1 Message Date
hjk
4886375994 QmlDesigner: Fix compilation with namespaced Qt
Task-number: QTCREATORBUG-24544
Change-Id: I9f16bf9a454f5b97ac6581274b0b08421b24c4da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-28 09:09:32 +00:00
David Schulz
89c8fbf676 ClangTools: fix compile
Change-Id: I2f92a9892baee52d9e64f02dc20c3085001a4783
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-28 08:59:38 +00:00
Eike Ziller
cfebe5a9da Complete documentation on IDocument
Change-Id: I72a62beaf6c8de0d2ae39a1c3c833708ca27b03f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-28 08:46:23 +00:00
hjk
30c55c063d Help/Android: Compile with namespaced Qt
Task-number: QTCREATORBUG-24544
Change-Id: Id06cc623b8a0bfe365dda928cda52a97321732b2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-28 07:59:15 +00:00
Miikka Heikkinen
f69ce702af QmlDesigner: Handle shaders and commands dragged to passes
Quick3D shaders and commands dragged to passes from item library will
be automatically added to corresponding property, too. The shader or
command is also moved to the same level as the pass as passes can't
have child nodes.

Task-number: QDS-2657
Change-Id: Id7efc302b06703ddd669b679b65d3adc9ecb48de
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-28 07:40:41 +00:00
David Schulz
e176958da1 ClangTools: Add automatic clang tool runner for open documents
Fixes: QTCREATORBUG-23349
Change-Id: I81197180c9d69c7df6184f8fcbf05f2256eaf7f6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-28 07:20:32 +00:00
David Schulz
7f562c4d33 ClangTools: Add diagnostic mark class
These marks can now be disabled.
This greys out the annotation color and the icon of the mark.

Change-Id: I5af4591db4baaaef55c986252f77d5d977427b56
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-28 07:20:19 +00:00
Aleksei German
ae0b98a32a QmlDesigner: Fix for States compilation break
Fixing compilation break in StatesEditorView:
 QtCreator is build with 5.12
 QScopeGuard is from 5.14+
 Replaced scope guard with unique_ptr

original task: QDS-2312

Change-Id: Id6a4bf513f37675044b073be2dfe52e3fa9dc3bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-28 06:48:12 +00:00
Aleksei German
61b21b0a2f QmlDesigner: Fix for RichTextEditor Qt Version
Original task: QDS-2634

Change-Id: I7edc580aec36090e037c4520ad364a62427df9f0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-28 06:48:02 +00:00
hjk
4314795992 Help: Replace Qt::MidButton by Qt::MiddleButton
Task-number: QTCREATORBUG-24098
Change-Id: I46e06ec1402be345ebd1e4543ed67a726caa42a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-28 05:50:50 +00:00
Christian Kandeler
a79b0c6558 C++: Offer only signals when completing in a connect() call
... at the second argument.
The logic is as follows: The clang code model checks whether the set of
completions contains any signals. If so, it instructs the built-in code
model to analyze the AST to find out whether the completion location was
at the second argument of a call to QObject::connect(). In that case, we
filter out all non-signals, because they are not valid at that location.

Fixes: QTCREATORBUG-13558
Change-Id: I9c7d0bd16161c723aef822280626cd06ece7df93
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-27 14:02:51 +00:00
Miikka Heikkinen
3fd9110233 QmlDesigner: Allow image drag to create Texture on all materials
Dragging image asset to any 3D material type now creates a Texture out
of the image. Default materials assign the created Texture to
a diffuse map and principled materials assign it to base color map.
Custom material just creates the Texture without any assignments.

Task-number: QDS-2657
Change-Id: I065f98cbc4d8c3293fbacea9ef8649d0a2edfb0a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 13:43:26 +00:00
Henning Gruendl
5a8d4c6fc1 QmlDesigner: Update icon font
* Update icon font
* Use newly added icons in EditableListView

Change-Id: Ia21c2120c54c41cd00dca07622ced98a0bf7f7f0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:06:04 +00:00
Aleksei German
f642c02eb6 QmlDesigner: Annotations for States
- Added Annotations support for States

Task: QDS-2312

Change-Id: I204ec958f85bd0f05eae0abbb3848d6d59e7e397
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-08-27 10:05:44 +00:00
Henning Gruendl
ac5d35a53d QmlDesigner: Remove parent as Connections target
Task-number: QDS-2651
Change-Id: Ib4520206cc2a3f8a044a66e3e01db0ec603a3029
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:05:26 +00:00
Aleksei German
ea20e6c0a8 QmlDesigner: Fix for Rich Text Editor
- Fixed tables style
 - Added border around color selector button

Task: QDS-2634

Change-Id: I5a164fedaefa87f394c7815a5bb416ec7898417e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:04:41 +00:00
Thomas Hartmann
aa055e74dc QmlDesigner: Change default zoom level for transition editor
Change-Id: Ibc120298cdb766e5ff53fa3b7fda40db7d89650b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:03:58 +00:00
Thomas Hartmann
e2e2c46206 QmlDesigner: Avoid visual artefacts
Avoid visual artefacts when changing states.

Change-Id: I00aa1499ff027d060b06699b60ebd2d5162d0e16
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:03:41 +00:00
Thomas Hartmann
acdb971048 QmlDesigner: Add suffux to invalid ids
Instead of replacing them with "element" add a suffix.

Change-Id: Idc72ba9a8a7b4f48d4e325378b975cafeab88bd4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-27 10:03:27 +00:00
Christian Kandeler
151373396f QbsProjectManager: Fix install step
We got the install command name wrong, which caused the installation to
fail. In addition, we forgot to add handling for the "protocol-error"
message from qbs, so the step was hanging, rather than aborting.
Finally, we triggered a number of assertions in
BuildStep::buildConfiguration().
This went all unnoticed for a while, because the install step is not
enabled by default these days.

Change-Id: I906e7e472563d4ad8fc7557bd706a7cb67f9f2ba
Reviewed-by: hjk <hjk@qt.io>
2020-08-27 09:38:55 +00:00
Christian Kandeler
4f2a21541e Debugger: Fix environment passed to inferior by gdb
We must not set variables that the user disabled.

Change-Id: I2f559aefd6aaa43298dd9c4889a614a5130622c0
Reviewed-by: hjk <hjk@qt.io>
2020-08-27 09:38:23 +00:00
Christian Stenger
b938764820 Utils: Simplify pathchooser validation
Allow to set a default value for the PathChooser which will
be used on the one hand as placeHolderText and on the other
hand for the default validation if the underlying line edit
has no text set.

Change-Id: I49d2f773cf3933cb30b54ee6de82290b480e743d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-27 04:29:47 +00:00
Christian Stenger
0de1668802 Fix qmake build of unittests
This basically continues / amends work done
with e1c88116b3.

Change-Id: Ia8b3a4694e7fea4c15e344839f87c11fbe8fbbf4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-27 04:28:52 +00:00
hjk
8cf1b598fe Android: Inline AndroidDeployStepWidget
BuildStepConfigWidget with manual tweaks is good enough.

Also move AndroidDeployQtStepFactory to the usual place at the
end of the file.

Change-Id: I92af31ef77f986b6fcd84a14ac62b70e2da32ff2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-26 10:43:07 +00:00
hjk
29a9565c89 Meson: Start aspectification of NinjaBuildStep
First step is to inline mesonbuildstepconfigwidget.ui.

As side effect, don't skip row 0 in the form layout and drop the intermediate
QFrame/QVBoxLayout level and insert the searchable wrapper directly.

Change-Id: Ibf2e348b2990ba48126ad7b92e98d0bcd8116196
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-26 08:52:25 +00:00
hjk
0538e8bfbd Nim: Move NimbleTaskStepWidget closer to NimbleTaskStep
Next step towards NimbleTaskStep aspectification.

Change-Id: Ifdb7d942e29ab99da01c6797d1edddd68afc5e30
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-26 08:52:11 +00:00
hjk
367624fbf2 Nim: Inline nimbletaskwidget.ui
A step towards NimbleTaskStep aspectification.

Also remove the intermediate QFrame, QListWidget is-a QFrame itself.

Change-Id: I1e37dc28ef2c8a89aff7c4baff0c1bd82ff3306f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-26 08:23:58 +00:00
hjk
070e0932c9 ProjectExplorer: Remove redundant MakeStep::{is,set}Clean()
This was only used for setIgnoreReturnValue(), which can be done
directly and also does not need to be stored in the settings.

Change-Id: I7419efe66d164b223463e19c3daf2350b4a2bae4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-26 04:51:47 +00:00
hjk
6c785c05ab ProjectExplorer: Remove ProcessParameters::resolveAll()
On all code paths, this was implicit in a ProcessParameters::setCommandLine()
which was on all code paths either called directly immediately before, or as
part of ProcessStep::setupProcessParameters().

With ProcessParameters::setCommandLine() as only user, this could be
inlined there. The effectiveWorkingDirectory() turned out to be out of
place and rather accidentally working there and was moved to
ProcessParameters::setWorkingDirectory().

Change-Id: I634f6086c2324e3cbecd3e5d50e22afc722abd3f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-25 14:19:04 +00:00
hjk
4b98cadb3a Qbs: Continue QbsInstallStep aspectification
Special QbsInstallStepWidget can be dropped.

Change-Id: I9040bbaa59c9da201c66a60a6ce9285cd53cf607
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-25 14:08:22 +00:00
Christian Kandeler
a2db85b11e C++: Fix indentation of doxygen comment continuations
Align also after the leading asterisk.

Fixes: QTCREATORBUG-11749
Change-Id: Ic054598c80206bf38b74345aed20d88486f57cad
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-25 12:51:10 +00:00
Eike Ziller
00ced26f47 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: Ib60df85a85fc1c94d8cc0dc23ea9fcdb4822bcab
2020-08-25 12:42:04 +02:00
hjk
fff3b41833 QmlDesigner: Fix UB in QmlPreviewPlugin::getPreviewPlugin()
Each call to PluginManager::plugins() creates a new QVector object,
iterators are only comparable for iterators from the same vector.

It worked in practice because the underlying storage was the same
here as the QVector objects were only shallow copies.

Change-Id: I2e276535942bd949acf91e12873c7bdf9d5c34d6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-25 09:48:03 +00:00
Christian Kandeler
d65ef60ea2 clang: Fix include/resource dir confusion
The getClangResourceDirAndVersion() function in ClangTools could return
the actual resource dir or the include dir, depending on the input. This
mistake happened because of misleading names spread all around the code.
Now the function returns what it says, and the other names are accurate
as well.

Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:18:30 +00:00
Christian Kandeler
a40d2ea705 CppTools: Do not ignore "built-in" compiler macros for custom toolchains
Built-in compiler macros are normally not passed to the code model,
because of potential conflicts with clang. However, in the case of custom
toolchains, these macros are provided by the user for the explicit
purpose of making them known to the code model.
Another exception are the bare metal toolchains, for which we now make
sure we won't get out of sync when new ones are added.

Fixes: QTCREATORBUG-24367
Change-Id: I2a0458d9132fdff15eb9adfcb2c06d7ef72508bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-24 10:02:20 +00:00
Christian Kandeler
a8b208bfae Revert "BuildDirectoryAspect: Print non-existing directories in red"
It's not an error that a build directory does not exist.
This reverts commit 2e4915bdb9.

Fixes: QTCREATORBUG-24503
Change-Id: I6138917885b6adbfaef6c49e54a3ea9900ed6b2e
Reviewed-by: hjk <hjk@qt.io>
2020-08-24 09:05:25 +00:00
hjk
61c8a93522 ProjectExplorer: Use new AspectContainer and TextDisplay
... as replacement for OverrideMakeflagsAspect.

Change-Id: Id8a3ccde7bf3b7c62679e927a82ce7d6acd37e66
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-24 08:23:00 +00:00
Thomas Hartmann
1d53e37b6d QmlDesigner: Remove unused custom notification
This notification is only for debugging and breaks encapsulation.

Change-Id: I20faeb76d24cc42417b3cc2e289041c70edd6157
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-24 08:03:13 +00:00
Miikka Heikkinen
4d3b34b4b0 QmlDesigner: Blacklist some quick3d property names as ids
Quick3D has some properties that are named same as default ids for
some other types, causing conflicts. Blacklist offending properties as
ids.

Task-number: QDS-2636
Change-Id: I988c69f61608ad7d80726dd74747917360827b84
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-24 07:17:39 +00:00
Christian Stenger
e6c750bd13 PE: Use InfoLabel for TextDisplay
This restores using an additional icon for the
label, but limits it to common ones.

Change-Id: Ic9b1a419525d1fefb071b9f612e910b56a600edf
Reviewed-by: hjk <hjk@qt.io>
2020-08-24 05:33:54 +00:00
Thomas Hartmann
9fee8a6bc0 QmlDesigner: By default item frame should be invisible
Change-Id: I60b4fbd3c6c4b74845dad783fc264072627a432c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-21 14:55:26 +00:00
Christian Kandeler
f852cfe284 CppEditor: Skip over access specifier when inserting a doxygen comment
That is, also do function-specific magic on typing "/**<return>" in front
of a function if there is an access specifier such as "public:" in
between.
This use case is rather weird, but it's also pretty easy to support and
it should not hurt anyone.
Note that depending on the indentation of the access specifier, the
indentation of the inserted comment will probably not be what the user
expects, but this is not easily fixable.

Fixes: QTCREATORBUG-20311
Change-Id: Ie32a71eede91ef64a19381c8e379a183a91fd27d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-21 12:23:18 +00:00
Eike Ziller
2a05186194 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	CMakeLists.txt

Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
2020-08-21 10:08:55 +02:00
Miklos Marton
3299239095 C++ Refactoring: Fix the include macros in header files after renaming
Fixes: QTCREATORBUG-4686
Change-Id: If22078bb183910941d8e2a94b0e8629baa2fa8de
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-21 06:50:42 +00:00
Wojciech Smigaj
795ccfbffc CMake: Register CMake tools detected while scanning build directories
Fixes: QTCREATORBUG-24502
Change-Id: Idf96e666e783edbf8b0fbe4216affb80b0464104
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-08-20 21:11:33 +00:00
hjk
bedf7d74a4 Mcu: Extend workaround for missing JSON file for Desktop target to Linux
Amends 08fe165ab586e6.

Change-Id: I3c3d205f083a3b59ac0490bf7ff22f12fb613b62
Reviewed-by: Jacek Nijaki <jacek.nijaki@siili.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-20 15:03:37 +00:00
hjk
c6818c62f1 PerfProfiler: Some compile fixes with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I9d3260034051dd15e7d5892e3300f5f719bdf5ca
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-08-20 13:34:33 +00:00
Thomas Hartmann
02c9f0384c QmlProject: Fix crash
Change-Id: I6b83b6c05b1c94f62c868329ea118d638d9928b6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-20 12:12:46 +00:00
hjk
0cdd07e06e AutoTest: Fix compilation with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I40b51e02fbb90b059d3cad16a57b70e463e6465d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-20 11:24:44 +00:00
Christian Kandeler
86728b84f1 CppEditor: Properly handle multiple inheritance
... in "Insert Virtual Functions" quickfix.

Fixes: QTCREATORBUG-12223
Change-Id: I7dad7c219017a8c7b10b08190e35d1899ca5dfe6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-20 10:34:53 +00:00