Commit Graph

7677 Commits

Author SHA1 Message Date
Tim Jenssen
d186d9df6a Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I0a598ba1b4d57be361a7a203d0c39e99b5cd5fba
2023-12-13 14:53:17 +00:00
Christian Stenger
1633d76b76 SquishTests: Allow designer test to progress further
Explicitly chose a newer kit as the kit we would use by default
lacks some compiler features on Windows.
This patch here only fixes the test crash when trying to access
a disabled menu item due to cmake dropping out with error when
parsing the project with the active kit.
Drive by change: removed workaround for fixed bug.

Change-Id: I783626f30d27ab1852536ae0d1f936ec8323feb8
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-12-11 14:03:13 +00:00
Robert Löhning
f52c92bfe5 SquishTests: Update tst_openqt_creator
Task-number: QTCREATORBUG-29923
Change-Id: I59ccfca431ab4a0d7d5bb8be78c078e2e5d58825
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-07 07:52:58 +00:00
Robert Löhning
5c1b8dee32 SquishTests: Simplify and stabilize special handling of Mac menus
- Check condition only once
- Make sure correct length is being used

Change-Id: I8c9627d91b4f022d60bae039c0478248cc30d183
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-12-06 07:35:12 +00:00
Robert Löhning
c0d1975ff9 SquishTests: Fix fetching Jira status
Change-Id: If01b08673f88588eee9370488a429a6f633d93db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-12-04 17:49:18 +00:00
Robert Löhning
b757ca9f7a SquishTests: Update expected tree for tst_cmake_speedcrunch
Change-Id: I13df997c6b265ba8795c7f1f3024c5deef5e2cad
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-30 09:25:52 +00:00
Tim Jenssen
39d1dae0d3 Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: Ic6e557806a3209e2c6d983d3c3fcfad66f6e3066
2023-11-16 15:56:06 +01:00
Sivert Krøvel
b080a3772c Handle nodes and properties required by MCUs in JSON conversion
Qt for MCUs uses several features in the qmlproject files which
are unknown to QDS. It is important that this information does
not get lost when converting to and from the internal JSON
project format, to avoid breaking MCU projects.

The following changes were made:
- Files nodes keep the type (ImageFiles, QmlFiles...)
- Added support for more Files node types used by MCU projects
  (ModuleFiles, InterfaceFiles, FontFiles...)
- Files nodes can have child properties
- Added a JSON object to store properties unknown to QDS.
  They may be used by Qt for MCUs, and new properties may
  be added between versions
- Added support for the MCU.Config and MCU.Module nodes
- Added a test project for MCU. This project is also tested
  with Qt for MCUs. Both the original and the converted
  project build correctly
- Added instructions for notifying the MCU team before
  modifying the MCU test cases to avoid breaking changes.

Fixes: QDS-10774
Task-number: QDS-10969
Change-Id: I0dfd7f3b150a8661fc0398a8a3d575c7e8777ef3
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-14 12:22:36 +00:00
Karim Abdelrahman
2dae80de93 McuSupport: detect if a project is QtForMcu
Update the way we used to check for mcus
project in McuSupport plugin. The old way
relied on the deployment step which is only
available when the user has already added a
valid QtForMcus package to "Devices->MCU".

The addition of "isQtForMcusProject" in
externaldependenciesinterface.h will be
used in a follow-up patch in
qt-creator/tqtc-plugin-qtquickdesigner
which adds a warning when using .qtbridge
for Mcu project.

Task-number: QDS-10599
Change-Id: Ibf46477a4f0cb4a82a10ac848acec75458bf6c03
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
2023-11-14 10:27:59 +00:00
Semih Yavuz
5b1aa26e47 Do not use QDir::separator() in QML reformatter test
That created a mix of / and \\ while building the path. Qt promises to
build paths that conforms to underlying OS if we always use /.

Amends  ffcbbecf27

Change-Id: Iebcb739cc02f0a2d6dd8953943ecfa9cf8fc9aea
Reviewed-by: hjk <hjk@qt.io>
2023-11-10 08:29:03 +00:00
Tim Jenßen
058fd820e5 Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I1e38a9dc4402a4cf836c32a6b0e5f49a836574b7
2023-11-09 08:46:51 +00:00
Semih Yavuz
ffcbbecf27 reformatter: Do not remove type annotations
Type annotations were being removed by the reformat action. Write out
the relavant annotations in ast to fix it.

Add exclusion mechanism in tst_qml_reformatter test since it performs
line by line comparison which doesn't fit all reformatting cases.
Introduce char-by-char data tests.

Fixes: QTCREATORBUG-29061
Change-Id: Ia52b51e6d7d938bdec325c4f426b11c722f85f8e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-11-08 11:09:02 +00:00
Marcus Tillmanns
503fd8121d Terminal: Make test actually manual
Change-Id: Ib44111401c4b4e1f16c8c53b6bd1f323f725cdd1
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-08 08:42:47 +00:00
Marcus Tillmanns
437797d1c4 Utils: Fix endless loop when ls iterating subdirs
findUsingLs did try to enter "." and "..", with especially "." leading
to an endless loop.

findUsingLs also did not correctly concatenate the parent folder
for sub directories.

Change-Id: Ieafad4d4ef38d2fb550ddef1d2edf8183ce8032e
Reviewed-by: hjk <hjk@qt.io>
2023-11-07 14:20:33 +00:00
Marcus Tillmanns
e108726314 Terminal: Add auto test
Auto test macOS terminal script.

Change-Id: Iaab9c31fa94cf16afc02e4e34978d5d10edf5c2d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-07 11:42:43 +00:00
Tim Jenssen
a28400ec7d Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: Ic0d4bc670cca264cc4013d98f692cdbde70cbaab
2023-11-06 19:55:06 +00:00
Jarek Kobus
f915a18a9e Process test: Adjust timeouts to minimize a chance for flakiness
The flakiness happened on mac inside recursiveBlockingProcess test.

Change-Id: I4d461fcdae1ecbf29f89bfdb4ad7ba017724f14b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-11-03 14:12:52 +00:00
Christian Stenger
cf88267011 Debugger: Adjust libcpp based optional dumper
There is no added value in providing the value of the
internal 'engaged' - just provide the value if possible.

Change-Id: I8c308902bf82c43e4238568fc9b185c3a3994b47
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-03 06:14:07 +00:00
Marcus Tillmanns
5becefbe72 Debugger: Fix QImage dumper
Change-Id: I423d139a16a8a08d9135a1d489c4d38ebac9c0f6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-02 13:58:01 +00:00
Tim Jenssen
b5c60597dc Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: Iefea658312bba6675eadce23fb8dc92f9207ea0e
2023-11-01 16:40:26 +01:00
David Schulz
7f1eaff398 Debugger: improve std::unique_ptr dumper for cdb
Fixes: QTCREATORBUG-29739
Change-Id: Ia8808c54137c762c54ad28f576c9d3be921d7d9c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-01 14:16:44 +00:00
Cristian Adam
bcc45d8bb9 CMakePM: Allow navigation to ${PROJECT_NAME}
Task-number: QTCREATORBUG-27211
Change-Id: I23e2c6f39ff3d4c89ef78a66c10e619e3df3245f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-31 15:52:41 +00:00
Marcus Tillmanns
53931b18ad Debugger: Fix QDateTime dumpers with TZ != UTC
Fixes it for Qt 5.4 and onwards hopefully.

Fixes: QTCREATORBUG-29737
Change-Id: Ic555e304a872dfbd458a95097e4e0b6a6632509a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-30 07:44:28 +00:00
Robert Löhning
b77b12c97b SquishTests: Restore lines removed from projecttrees
Partially reverts 3970a834bc
and 5bce234986

Change-Id: Iaf05f4c19e16b4e0d817350d4121ad371b8b1661
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-26 19:18:05 +00:00
Burak Hancerli
ab2c25d52a QmlProject: Absolute files paths are ignored
This patch fixes issues with adding files to the project by
providing the absolute paths in the .qmlproject file.

- If a directory is given without an explicit file list,
then that directory wil be searched recursively.
- If explicit file list given without a directory, then each
file will be added to the project separately.
- If both provided, then each file wil be prefixed with given
directory, and added project separately.

Task-number: QDS-10636
Change-Id: Ia13964ce2b3f6364d1def1aa71e20ec29f6f3542
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-10-20 10:08:24 +00:00
Marco Bubke
ad12bbb669 QmlDesigner: Add object trace
'N' and 'D' phases are not supported by Perfetto. So I mapped it to
async events. This patch is improving the interface for arguments too.
Now you can select the type for you arguments. So the name can be a
string_view but the arguments can be a string.

The variadic template arguments are used to prevent any conversion code
which could not be optimized out for an empty function.

Change-Id: I1ad1927b5e3b63607a21df1351b1f5cfba50159c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-17 11:55:03 +00:00
Marco Bubke
11bf705e26 QmlDesigner: Add move only trace token
It is quite hard to define always an end to a trace. A move only
token can do that. The drawback is that the token gets bigger but only
compile them for an avtivated category.

Change-Id: I88b47c5b47e4129b1cd402e89251b45fa126111c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-10-17 11:43:58 +00:00
Eike Ziller
3363d71888 Build: Fix handling of (s)ccache support
So it also works when building individual projects like cdbext

Change-Id: Ibb9cac77146a9f19cbbe22f2c7257b951f38f3fc
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-10-17 07:30:51 +00:00
Marco Bubke
c4deafc555 Nanotrace: Export functions and add dependencies
Under linux it was linking But I think it will not work under windows
without exports.

Change-Id: Idd27583defc1c00a6bb2426efb160e7d90abd3df
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-10-13 15:15:50 +00:00
hjk
2893e892df Debugger: Adjust expectations of manual bigint test
It was wrong.

Fixes: QTCREATORBUG-29705
Change-Id: I4870d0f1b6b80a4b70803be213cfed51fa37982c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-13 11:21:01 +00:00
Christian Stenger
25a1fb4e9c SquishTests: Fix testing of welcome page
The examples and tutorials part of the welcome page got a
new approach which is either having a sectioned grid view
or a non-sectioned grid view (while searching).
That means we have now a model holding the items of several
other (sub)models and a filter model taking care of what is
shown while searching.
While searching we need to check the filter model, while for
not-search the original list view could be used as we did
before this patch. But as there are no access or verification
of the whole list this done is just replacing the old approach.

Change-Id: I1777340f8c6ea88af3bfc20a600ee1c174a18807
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-10-13 10:07:39 +00:00
Christian Stenger
7459fb0c75 SquishTests: Tweak the handling of special clang
When expecting the clang from llvm used to build QC we
nowadays have to resolve symbolc links.

Change-Id: I54cfecc15d77f244eccd81d5cdd14ec7297e1eeb
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-10-13 10:07:25 +00:00
Marcus Tillmanns
413fda678f Utils: Add "layouting" widgets to layoutbuilder
This allows us to handle widgets that have an "addWidget" function.

Change-Id: Id1b63bae7032403fdd3c5e6ba60283cf56cc1cfe
Reviewed-by: hjk <hjk@qt.io>
2023-10-12 10:32:56 +00:00
Marcus Tillmanns
644e88ae2e Utils: Emerge widgets from LayoutItem
This allows us to call e.g. PushButton{}.emerge(); without having to
add another unnecessary layout.

Change-Id: Ica26f4776dee1843e1f40c238e1f3c1a54d14ea5
Reviewed-by: hjk <hjk@qt.io>
2023-10-12 10:32:44 +00:00
Marco Bubke
cd4cca907b QmlDesigner: Move item library entries to project storage
The subcomponent manager is synchronizing some meta files with the item
library. The project storage is synchronizing types. Synchronizing both
is quite complicated. Moving the the functionality to the project
storage removes that synchronization task.

Task-number: QDS-10266
Change-Id: Icdf14fbe85d5c4891542acae85ebecf0ba77b45d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-11 17:46:23 +00:00
Christian Stenger
52ebafda4d SquishTests: Fix handling of arguments proposal
On slower machines or high load the proposal can take a split of
a second to appear. Wait shortly for the proposal to appear.
Amends 1d449ad7d6.

Change-Id: I705ce3819e13116386304994da60ab6660ccfbd8
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-10-11 06:57:35 +00:00
Christian Stenger
511c706153 SquishTests: Fix handling of clang based proposals
Change-Id: I6e66537ba2a562c835fef4363bdd422330288506
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-10-11 06:57:28 +00:00
Christian Stenger
b63c0670f8 SquishTests: Fix finding help contents
Fixes suite_HELP.

Change-Id: I57c0b82a758d3c91f29c4c48a8c33672f71afde2
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-10-11 06:57:18 +00:00
Marco Bubke
100ea34060 Sqlite: Make SmallString::number locale independent
std::to_string is locale dependent. std::to_chars it not. Because some
of our supported compiler(libC++) don't support std::to_chars for float
we use the QString.

Change-Id: I9a8f5d1d9b769faca0a7ac2d0798b91ee6b814d2
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-10-11 06:54:01 +00:00
Cristian Adam
c929b71acd CMakePM: Add cache variables to code completion
Change-Id: I5ac4fcf3ca7755ab52ffecafd83922e4e380363e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-10 18:29:06 +00:00
Cristian Adam
524634f124 CMakePM: Add support for "$ENV{" code completion and help
CMake has a few environment variables that are documented and this
commit adds support for them.

Change-Id: Iaa31bdc97b343581fcf519d19e66bc6ce8ace150
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-10 18:08:13 +00:00
Eike Ziller
8ca6890814 QmlDesigner: Quiet messages from find_package
The information is available via the CONDITION and FEATURE_INFO

Change-Id: I0da6338736316e5976c1addad6c25d083e7d772d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-10-10 08:22:42 +00:00
Cristian Adam
380ca70d61 CMakePM: Add manual test for code completion / navigation
Change-Id: Id7ad47babf4c6fff8e7b823805d6ccf858a3d513
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-09 14:42:03 +00:00
Cristian Adam
6010b096c1 CMakePM: Move specific manual tests to cmakeprojectmanager
Previously this folder didn't exist, but now it's better to have
them all in one place.

Change-Id: Ib8a2f24157a34e817e653929d01dfc9675f1c019
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-09 14:41:54 +00:00
Marco Bubke
740e1edb98 Sqlite: Remove default constructor
Because it holds a reference it is not possible to have a default
constructor.

Change-Id: I442bedf5fb2abfd79ad64520c74636340dabf741
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-09 14:05:18 +00:00
Marco Bubke
f25413a151 QmlDesigner: Fix duplicate in .clang-format
Change-Id: I88b1a126e30894167de0e3023a957eb22b5368fb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-10-09 09:46:48 +00:00
Christian Stenger
248ac4a658 SquishTests: Adapt to moved menu item
Change-Id: Ib8df3f315b3e82b5ac4cc81f1347db801de994ff
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-06 11:46:31 +00:00
Christian Stenger
c45ab95400 SquishTests: Fix finding line edit on wizard
Change-Id: I75059b7e302b1e54b8ac78357f631ca2fd15269a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-06 11:46:26 +00:00
The Qt Project
0a5f48a949 Merge "Merge remote-tracking branch 'origin/qds/dev' into 12.0" into 12.0 2023-10-05 13:57:02 +00:00
Tim Jenssen
85ea2758ac Merge remote-tracking branch 'origin/qds/dev' into 12.0
Conflicts:
	share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml
	share/qtcreator/themes/dark.creatortheme
	share/qtcreator/themes/default.creatortheme
	share/qtcreator/themes/flat-dark.creatortheme
	share/qtcreator/themes/flat-light.creatortheme
	share/qtcreator/themes/flat.creatortheme
	src/libs/utils/CMakeLists.txt
	src/plugins/CMakeLists.txt
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21
2023-10-05 15:53:42 +02:00