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>
... so they show up in the project tree and search results.
Change-Id: I42ae1f0c2f96ea07952c7b23bd809cddd938c69f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
... as replacement for OverrideMakeflagsAspect.
Change-Id: Id8a3ccde7bf3b7c62679e927a82ce7d6acd37e66
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This restores using an additional icon for the
label, but limits it to common ones.
Change-Id: Ic9b1a419525d1fefb071b9f612e910b56a600edf
Reviewed-by: hjk <hjk@qt.io>
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>
Since external plugins are interacting with the puppet
we need them in the dev package.
Change-Id: I871629ad80583a09b842bb60cd5b6fab5b512fae
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
If the QtQuick3D import becomes before the QtQuick import,
then QtObject is not recognized as a prototype of the QtQuick3D types.
Workaround: provide a pane for Object3D.
Task-number: QDS-2648
Change-Id: I337a30d09233101a8e7b00cc2d145d8211933571
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Tools > Git > Git Tools > Merge Tool is visible only when
the user has a merge conflict to resolve.
Change-Id: I1c08dae329152726139d075b03a98875b789e154
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
The dialog shows a kind of completion popup. After that, the Locator
does not get proper focus anymore. Clicking into the dialog closes
the completion popup and seems to fix the focus problem.
Change-Id: I0ae901cc4f23b66d2c3db2c96109be79a0ded52c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
QMap::unite() is gone, the replacement insert() came late, so ask
the preprocessor for help.
Task-number: QTCREATORBUG-24098
Change-Id: I2f596f9a998fa795fe0df378a39c4f1267f4e6e7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
QMap and QMultiMap are distinct types in Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I959012739231fb3b184dcc13cebd119c83059a99
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Remove the pixmap part as pixmap and label text are
mutually exclusive and currently not used.
Beside this we must not call setVisible() before adding
the label to an already existing widget or layout or it
will be temporarily pop up as separate widget.
Amends 9e54e1776e.
Change-Id: Iaa57bfd1ca105d7360eaa360d68dbde38eaf0aeb
Reviewed-by: hjk <hjk@qt.io>
Amends 200d81d3, which mis-placed the call for argument setup,
effectively resetting it to default on each run.
Change-Id: I4b4f3ab90570d14e7ffc41346eb4f06241eb4f4c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Multi-line strings must be kept as the user wrote them.
Fixes: QTCREATORBUG-20180
Change-Id: I141eff52b55d31215e6f5c6c5a0e026689db877a
Reviewed-by: David Schulz <david.schulz@qt.io>
Persistent settings cannot handle QVariantHash and when
reading the check state the meta type system seems to have
the need to have used the check state already before,
otherwise it will fail to convert until it uses it.
This happened e.g. when re-opening a project that had
former check states stored inside the project settings
directly from the Welcome page after starting QC.
Amends df49d6e40d.
Change-Id: Id2b85373c151efb5890fe5fb7392bdbc11adda50
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Added observation functionality for a temporary move
of the URL.
Let the test fail if the move becomes permanent.
Change-Id: I7989d654ea6e89ccba112b5cb640144afba40339
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Amends 6989c9bbea
Since the change above the filename is checked before the mimetype, so
we have to save it in the same order.
Fixes: QTCREATORBUG-24505
Change-Id: Ib974dc0f69ca56cfd6ee9e34bec238e62f800598
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
