Commit Graph

8097 Commits

Author SHA1 Message Date
Marco Bubke
e6617f520c QmlDesigner: Provide local propertries
It returns all local propeties in a sorted order.

Task-number: QDS-7276
Change-Id: I030d63b64e66b0c06b33904e5b157ed8aa060ae5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-12 19:53:08 +00:00
Marco Bubke
e7a013cbfc QmlDesiger: ProjectStorage provides properties for typeId
It returns all properties of the type and the prototype chain in a
sorted order.

Task-nubmer: QDS-7276
Change-Id: I95c16abd16d9d0f1fdf68d3425780a888dc056b7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-12 19:53:01 +00:00
Tim Jenssen
b888c67f0c qmldom: resolve missing dependency if WITH_QMLDOM is enabled
Task-number: QDS-7257
Change-Id: I51045a40108865174491dc55fa1536399b309bd3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-07-12 12:58:27 +00:00
Eike Ziller
90a03391d7 Merge remote-tracking branch 'origin/8.0'
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
2022-07-12 13:56:23 +02:00
Jarek Kobus
872494fc4b tst_QtcProcess: Increase the timeout
Fix recursiveCrashingProcess() flakiness.

Change-Id: I0d62368ccb5b67be691a787b6fa69717a4f024d1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-12 09:42:14 +00:00
Marco Bubke
1e6c8f6e61 UnitTests: Update google test to 12.1
It fixes a warning.

Change-Id: I2a0ab042898d7333b0ce954d0299ea520a933939
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-11 09:28:38 +00:00
Marco Bubke
02d05f76d9 QmlDesigner: Explicit instantiation of ProjectStorage
Change-Id: If56a3b7f8189c998a6335a31ecca8a82cb269604
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-11 09:28:02 +00:00
Marco Bubke
dc32c6028c QmlDesigner: Add getter for type id
The type id getter expects a valid module id, an exported name and
optionally a version.

Tsk-number: QDS-7271
Change-Id: I9af5f926b97606fc312eb1158367aba7105cdefb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-11 09:24:12 +00:00
Marco Bubke
c37e69ee2c Valgrind: Disable warnings
Change-Id: I76c2833828b52b24886e148ff37a07ef87a38336
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-11 09:11:29 +00:00
Jarek Kobus
d578b3a7c0 Remove manual test for QtcProcess
It's not clear what this test is going to do and
how to run it. Besides, it's not working at least
for one year already. There is not a big loss, since
it was utilizing QtcProcess::readDataFromProcess() only.

Change-Id: I821cd2755d5889ddc3f772352148d595ca1816c2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-11 08:35:32 +00:00
Marco Bubke
180bcbef8a Sqlite: Fix locking
Change-Id: I32a1435db21f6d891dd9bed4faada704aeaf43af
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-07 17:50:55 +00:00
Marco Bubke
936ae86598 QmlDesigner: Add ImageCacheDispatchCollector
Instead of creating a new cache for every collector we now use a
collector dispatcher which is dispatching the request to different
collectors.

Tsk-number: QDS-7258
Change-Id: I024622d4b757e1ff10f7cab4204d1742ef5926da
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-07 17:50:06 +00:00
Marco Bubke
8fbd703974 Utils: Add endsWith to SmallStringView
Change-Id: Iea8286b46c28a68b26904e256b9f084c32c79909
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-07 17:49:34 +00:00
Marco Bubke
fe50af151d QmlDesigner: Simply property type name check
Move some repetitive pattern to PropertyMetaInfo

Change-Id: Iba8722d3d95881c1db85c12cbc2b2b8c4b629f2c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-07 17:48:23 +00:00
Eike Ziller
f950a5d86c Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/libs/utils/terminalprocess.cpp
	tests/auto/qml/qmldesigner/coretests/CMakeLists.txt

Change-Id: Ifc5b37dadd46af752f0771a2685da1ac9a6260bd
2022-07-07 13:47:12 +02:00
hjk
d3786a895b Debugger: Use some Tr::tr in WatchModel related classes
Change-Id: I1fcd0c5f342da4fd5ff52c19eb9f3f20a9bdcc5b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-07 08:52:11 +00:00
Marco Bubke
fd41105191 QmlDesigner: Introduction of PropertyMetaInfo
Because the project storage is integer id based the string based API
isn't fitting well for the new approach. PropertyMetaInfo can be easier
mapped to the project storage.

Task-number: QDS-7197
Change-Id: I49bc650abdaacf4b039d76c2514b5ad05ec84abe
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-06 12:40:58 +00:00
Eike Ziller
d059a610b1 COIN: Arm auto tests
Some of our auto tests fail, so add an EXCLUDE_FROM_PRECHECK option for
add_qtc_test, which sets a corresponding label on the ctest, and exclude
these when running ctest on COIN.

Disable the Googletest based unittests for now, they are inconsistently
failing on CI, e.g. sometimes timing out after 60 seconds for tests that
usually take only a fraction of a second.

tst_perfdata from the perfparser submodule also fails. Temporarily
disable it explicitly, until the EXCLUDE_FROM_PRECHECK change can be
merged there.

Change-Id: I7e9d7aded75bbe8800f82f7aa125c181271a2a1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-05 10:13:18 +00:00
Jarek Kobus
5d3b8c4d88 tst_QtcProcess::crashAfterOneSecond(): Increase the timeout
Increase the timeout to default 30 seconds when
waiting for finished. Apparently 2 seconds were
sometimes too short. We still ensure that waitForFinished
didn't timeout but finished eariler.

Change-Id: I12ca647b45537174c7c66d271e7c8a477184f2ff
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-05 07:24:34 +00:00
Eike Ziller
91fb0cf123 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp

Change-Id: I5106bb632c2a3a144287097137be45b0894b9ee4
2022-07-04 08:53:22 +02:00
The Qt Project
d69cf8096d Merge "Merge remote-tracking branch 'origin/7.0' into 8.0" into 8.0 2022-07-01 13:27:55 +00:00
Eike Ziller
caed14b22d Fix pluginspec test for Windows release builds
Used a wrong name for the plugin library

Change-Id: Ic1cff07387b660a641c2f43bfb913bd8b8668c5c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-01 11:34:56 +00:00
Tim Jenssen
56bcad81ad Merge remote-tracking branch 'origin/7.0' into 8.0
Change-Id: I7cd5d3808007ef739212f4347ba9b16e7b298943
2022-07-01 09:22:10 +00:00
Tim Jenssen
a920bbf59f qmldesigner tests: remove unnecessary defines
Change-Id: I1363e7e2ac174b51236644dd37fe184e711e96d3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-01 09:17:39 +00:00
Tim Jenssen
88080612bc tst_qml_testcore: fix spelling
Change-Id: I76345be2a8837c4371abf2f4a4695d1edebf2770
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-01 09:17:32 +00:00
Christian Stenger
662cc3ca06 Squish: Adapt to changed UI text
Change-Id: I02d178646ef04893f8d839b2a30085798f1c5fa7
Reviewed-by: hjk <hjk@qt.io>
2022-07-01 09:14:53 +00:00
Jarek Kobus
46f751e61d tst_QtcProcess: Test all waitFor...() methods
Test all waitFor...() methods when trying to run a non-existing
executable.

Change-Id: I958e1dd5ac1731788b6d0e94d9eb277c9e15c4e4
Reviewed-by: hjk <hjk@qt.io>
2022-07-01 08:39:22 +00:00
Christian Stenger
84730c76df Tests: Disable QmlDesigner tests before Qt6.2
Change-Id: I6a47548313516a0c1ebe550ef8fe00d420eefa84
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-30 09:23:28 +00:00
Christian Stenger
c294df1d3a Squish: Skip a test
Wizard nowadays expects a Qt version we do not provide by
default.

Change-Id: If0f2b3aa5755a549bd63fc258fd78b1a40337a8a
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-06-30 08:51:36 +00:00
Christian Stenger
450f4abe74 Squish: Adapt to changed ui
...and modified minimum requirements inside wizards.

Change-Id: I32d2dea0dc0ccff273ebf32f5aa713829330eb01
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-06-30 08:51:21 +00:00
Christian Stenger
7103432404 Squish: Do not expect clang shipped by QC anymore
Change-Id: I2f09835bde52aa2f0cd90def7f6d8d628736ff56
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-06-30 08:03:11 +00:00
Eike Ziller
6c98721efc Merge remote-tracking branch 'origin/8.0'
Change-Id: I552d201d09d62d21655176467088c6e48b8a2fe2
2022-06-29 15:29:49 +02:00
Marco Bubke
7339049290 QmlDesigner: Fix spelling for condition
Change-Id: I419ac03ce01905304cbcaad514f7c29563301355
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-06-29 08:03:57 +00:00
Marcus Tillmanns
3958087124 deviceshell: fix hang on multithreaded access
When outputting a commands stdout / stderr / exitcode,
the shell was free to interlace different outputs.

This could trip the parsing of the output, leading
to the shell missing the exit code of a command.

When that happened, the caller might wait indefinitely
for a result that would never come.

To workaround, the shell script now writes each command output
to a temporary file first, which is then written to stdout
by a single subshell, that way guaranteeing that the output
of multiple commands will not interleave

Change-Id: I9d8e7e788f5922c612ff533e5ba063f61a22aa8c
Reviewed-by: hjk <hjk@qt.io>
2022-06-29 07:28:46 +00:00
Marcus Tillmanns
88651ecb3e deviceshell: Disable tests on old macos versions
The bundled "base64" tool of macos < 10.15 did not support
the "-d" option ( only -D ). We disable the tests running
on the local shell to keep them from failing.

Change-Id: I6af353869033ed15cefedc03e2562621d1ea9904
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-28 11:31:11 +00:00
hjk
e2bb204d4d CPlusPlus: Inline more simple Type related functions
Change-Id: I2103e8047b385b438e58072e8a2689f1889d2724
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-28 11:02:22 +00:00
Christian Stenger
6b32f58225 QmlDesigner: Fix qbs build
Change-Id: Ie83a9e67f63aa2424423710140c65b4bec6770bf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-28 10:20:19 +00:00
Robert Löhning
0c2e1cf094 Squish: Update location of Options dialog
Change-Id: Ie9df4f897621520744998c3dbd9a3c44600ba844
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-28 10:13:34 +00:00
Eike Ziller
f95a1eca34 Merge remote-tracking branch 'origin/8.0'
Change-Id: Icef5e28557701243e686d35cf885412eb341e75a
2022-06-28 11:35:16 +02:00
Eike Ziller
e46357a220 Adapt to move of options to Edit > Preferences
Change-Id: I6881f658db9eec5059b434bce12093667535d5ac
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-06-28 08:32:22 +00:00
Christian Stenger
8d3c2ab348 Tests: Disable SSE dumper test on arm macOS
Change-Id: Idc6f769a7967fa6afb27e419238a10d631bca0fd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-06-27 12:56:47 +00:00
Eike Ziller
c7b724c4ca Merge remote-tracking branch 'origin/8.0'
Change-Id: Ia1c97d5949de607177a5a0632c7e8a37cbfd3475
2022-06-27 10:33:44 +02:00
hjk
ffa3aad576 CPlusPlus: Inline some simple central functions
Depending on context, callgrind sees contributions of >8% to
the total cost of project parsing for these functions. The
functional are actualy executed executed out-of-line, often
for a function body of one "payload" instruction only.

Inlining removes the call/endbr64/ret overhead.

Change-Id: I6886f08e322fcaa4e0f54d424279e0a8c24e4718
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-24 11:49:41 +00:00
Christian Kandeler
e2b99e6b31 Unit test: Remove libclang test remains
Change-Id: Ifa2cd2727ecf80d3b29dc2bc2a10af11baa2f1dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-24 11:01:01 +00:00
Christian Kandeler
224be9add8 ClangTools: Move over a test from unittest
Change-Id: Id61a0bdb8e46ead4de8ad0298e62afb7b9fbcfb4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-24 10:05:54 +00:00
Thomas Hartmann
34491bdfc3 QmlDesigner: Only remove node with position
Extending the test case.

Change-Id: I37255de763262e069c2f9d30b1ce584a0347fbcf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-24 08:32:14 +00:00
Christian Kandeler
67a08683d1 ClangCodeModel: Move a test over from unittest
Change-Id: Iac295216fff274fbe4a109477b1a4c2bd2c98d5d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-23 13:54:14 +00:00
Christian Kandeler
7dfbe785e9 Unit test: Remove unused files
Change-Id: Ia8d8f2014f8180d5c5fa89538d5aa7fc8821bc28
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-23 13:43:58 +00:00
The Qt Project
380c247945 Merge "Merge remote-tracking branch 'origin/8.0'" 2022-06-23 10:41:37 +00:00
Marco Bubke
d87d493de2 Sqlite: Only declare the defines for the sqlite files
Change-Id: Ic5a7be63c86cf3f369309fc4d21cf6f5ceefb098
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-06-23 10:33:20 +00:00