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>
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>
And pass explicitly a QVariant to the writer to avoid
unexpected behavior when trying to store the geometry
of a widget.
This resulted in a warning for any session where the
user had used the debugger at least once.
Change-Id: I5cb2352ab29ff7d2a64c84ffcdf040efe6d04b94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Not really a big win here, but in line with what most others do.
Change-Id: I19f100084c8ca4cc7d0de97125efdc519bdfc972
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Previously whole SDK configuration for Renesas RH850 was hard coded.
Now configuration is read form the json file - same as for the other
SDKs. This changes adds new boardSdk params:
- name: sets the name for the SDK. If not set existing logic for
generating name as "MCU SDK()" is used
- defaultPath: path where to look for the SDK if env variable is not set
Change-Id: Ia4b92c95bdc3302309cea4b935afbdd2e0bcadbe
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Use app_target_default_main() macro and default entry points that come
with Qul instead providing own main.cpp templates.
Qt for MCUs has own default entry points implementations that may vary
for release to release. OS cmake variable is also removed in Qul 1.4.
Change-Id: I729b28250671c1a873d30d8c6c4f8d12306435d2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
FreeRTOS backend is now a separate platform and requires dedicated json
kit file. Starting form Qul 1.4 there is no option to produce BareMetal
and FreeRTOS kits out of one json file.
This change is backward compatible with Qul 1.3.
Change-Id: Ic50b566a7f1a01fad4b00c07e723dfe1343fc2b0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
We need to check canonical paths with canonical paths.
Otherwise we get a mismatch when using e.g. a linked directory for the
source path on the command line and then try to import the build in Qt
Creator.
Change-Id: I153be74b6cfdf5070e023780604ce64c92df0e6d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This reverts commit 7856c2c2f0. There were files
compiled which are not used in the tests but have external dependencies.
So instead of using the preprocessor we simply don't link the source
files in the project.
Change-Id: Ibba4a1dace1868b016af7135262c795bb29af204
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Fixes the sympton of QDS-2554, but not the real issue.
Task-number: QDS-2554
Change-Id: I8e0aca0b843bcb2befdc2d9a85b2dbfdb468ffb2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This is actually a slight change in behavior insofar as
the summary now uses the same environment as the build
itself. This should not matter, or even be more correct.
Change-Id: I48e5be6cb7b97606f80f563ba399c4b6ff61c3bf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
That's effectively a beefed-up TextDisplay previously used only in
Incredibuild.
Change-Id: I0cedef24cede8b8513e80b64f589abe62a68814e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
When working with multiple windows, pressing the close button multiple
times can close Qt Creator too.
This patch adds a system option, asking for a confirmation before
closing the IDE. By default it's not enabled.
Fixes: QTCREATORBUG-7637
Change-Id: Ifc5e8c97511f9227ce0634c8a7064d95775c76c2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Add some convenience functions to the base class to avoid repetition
in the derived classes.
Will be used immediately it in some derived classes.
Change-Id: I8fd6aa4f8351720cdc8f63f7fa5f506e32a8143b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
For further use in conglomerates like OverrideMakeFlagAspect.
Change-Id: I845ff085d15779e43431ab3858c5c1b55824f694
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Trade a duplicated 'make' for a 'make clean' step.
Amends 571fb04d.
Change-Id: I06dca803715a5c0a1a0917e4a4d5bac5704e8a43
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
There were annoying inconsistencies, for instance:
- A not fully matching declaration was found from the definition,
but not vice versa.
- An implementation MyClass::foo(int) would fall back to a
declaration foo(), but an implementation MyClass::foo() would
not fall back to a declaration foo(int).
These cases behave consistently now. To this end, the clang code model
now forwards to the built-in code model if a function lookup has failed.
Fuzzy matching for free functions has been limited, as the cons appear
to outweigh the pros. For instance:
void foo(int);
void foo(double) {}
Following the definition would lead to the non-matching declaration,
which the user most likely does not want.
As a side effect, redundant code has been removed in the SymbolFinder
class.
Fixes: QTCREATORBUG-20279
Change-Id: Ib97d6710c7e12fb0fdbc30b51a0067e09bfc2190
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
