Commit Graph

8097 Commits

Author SHA1 Message Date
Christian Stenger
a86356ce8a Squish: Fix menu handling on macOS
Some menus inside QC have special numbering - but this only
applies to Linux and Windows. On macOS we do not add this
special numbering.
Additionally this patch stabilizes the triggering of
submenus. When they get triggered it takes a split of a
second until the items inside the menu are usable.
Let squish wait until the sub menu is fully present before
trying to activate some of its items.

Change-Id: I32c688a937ada1da07506d4ebd22730e4f2bcaef
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-18 13:23:15 +00:00
Marco Bubke
2322313baf QmlDesigner: Remove typeName usage in binding editor
Task-number: QDS-10266
Change-Id: I91232c1296c4ed3b3148af9053d3db0f43a08e24
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-07-18 09:00:14 +00:00
Marco Bubke
3d5ceb795d QmlDesigner: NodeMetaInfo can now get exported type names
You can get all exported names. That can the C++ names too for C++
types. If you only want the types name which are imported in a document
you can provide the source id for the document and get only that. If
there are different version exports you get them too.

Task-number: QDS-10274
Change-Id: Iefc0b68ebfd65998cf0481961f8c7643cdf9e5b9
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2023-07-17 09:36:58 +00:00
Marco Bubke
f7f65b9ea4 QmlDesigner: Get exported type names for type id and source id
It is matching the document imports with the exported type names.

Task-number: DS-10265
Change-Id: I0623cd0b3d04fa1a8c05354a194f10f3d8948b21
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2023-07-17 09:36:49 +00:00
Marco Bubke
e7bc9846d1 QmlDesigner: Add exportedTypeNames(TypeId) to project storage
Task-number: QDS-10265
Change-Id: If440f87b6719b865216e3890c8492c3682cf42dd
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2023-07-17 09:36:39 +00:00
hjk
9f72b0519f Unittest: Work around warning for unused parameter
Amends 7fada70e8f.

Change-Id: Ic47526a497c67dab48903b6500a37bab742034fd
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-07-17 09:23:38 +00:00
Eike Ziller
ac0796926d Merge remote-tracking branch 'origin/11.0'
Change-Id: Iaa647a44accc98ae84aa095d0bd5049588a92387
2023-07-14 14:51:22 +02:00
Eike Ziller
c43a2ee1c4 Use categories for Tutorials page
Instead of adding the category into the title with "Help: ..." etc, use
the actual categorized view that we already use for examples and
marketplace. Set the corresponding meta data in the manifest file and
read it also for tutorials.

Change-Id: Id9081518c1c0afee8d080af3ca8a5dca5cdde775
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-14 09:33:03 +00:00
Christian Stenger
80c3b30366 SquishTests: Attempt to stabilize tests on macOS
Change-Id: Ifd7137f88e9d8736cbc7d1a4374f8ce640c1082b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-13 12:13:29 +00:00
Eike Ziller
835201060d Merge remote-tracking branch 'origin/11.0'
Change-Id: I2e0e8dd5f9b42533c665255f8539e837938846de
2023-07-13 08:28:42 +02:00
Christian Stenger
6ef4bd0a65 Revert "SquishTests: Adapt test for Qml debugging"
This patch had been valid when there had been another different issue
of using qmlpuppet instead of qmlviewer or qmlscene.
The other issue is fixed, so this patch is obsolete and now wrong.

Change-Id: I291651256db2da1763d918c34811f03950cdb322
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-12 09:02:17 +00:00
Marco Bubke
e7a7914aa8 QmlDesigner: Fix skip auto moc
Actually the syntax was wrong.

You can use

SKIP_AUTOMOC foo.cpp

or

PROPERTIES SKIP_AUTOMOC ON

SKIP_AUTOGEN is skipping AUTOUIC and AUTORCC too.

Change-Id: Id4afdc2572fc287ae66368ba0fd70b3ce7fc04ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2023-07-12 07:15:50 +00:00
Marco Bubke
98cff9e097 QmlDesigner: More test for NodeMetaInfo
Task-number: QDS-10055
Change-Id: I23a9d7ea87dff9f3e07f5beeb734cea7d01d2e94
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-07-12 07:13:39 +00:00
Marco Bubke
8ab4968278 QmlDesigner: Introduce origin flags
metaInfo.isProjectComponent() is signaling if a file component is
directly part of the project. metaInfo.isInProjectModule() otherwise
shows if a type is inside of the project as a qmldir module. Both cannot
be true. If a type is not part of either it is a system type.

Task-number: QDS-10251
Change-Id: Iae2270827a500ad6393e3751b3af276f9b030679
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-11 15:42:48 +00:00
Marco Bubke
a3f990d713 QmlDesigner: Add type lookup
Task-number: QDS-10246
Change-Id: I607f72e29734a3c59b7b5b33d96735d708cd18ec
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-11 15:42:06 +00:00
Eike Ziller
3d3c78dfc6 Merge remote-tracking branch 'origin/11.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: If3ada34dcc764fa1d0cce04fd343fb5a02c2fbaa
2023-07-10 09:29:51 +02:00
Christian Stenger
942a9d0519 SquishTests: Avoid different type structures
On Windows the read content will be bytes instead of str. To have
a unified code path we need to convert it to str.

Change-Id: I16004968d8fed7bb2336ad594c31b38100f773cd
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-07-07 11:16:28 +00:00
Eike Ziller
29ca86ce65 Haskell: Update dependency for manual test
Stack didn't want to install that old stuff anymore.

Change-Id: I8e196bca92b2a6100c8e4d1431f7588c6efad946
Reviewed-by: hjk <hjk@qt.io>
2023-07-07 08:33:18 +00:00
Robert Löhning
e92c61441f SquishTests: Update tst_SCOM04
Change-Id: Ic41d30987069e9040a20838db1a55876f610a203
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-07 08:29:06 +00:00
Christian Stenger
e5acc8b072 SquishTests: Fix verification of debugger detection
There are now generic debuggers registered - adapt the test accordingly.

Change-Id: I102ac0ac44666c4da17ff6ea01f048abba66e6e7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-07 04:28:25 +00:00
Robert Löhning
c5a0ae6f34 SquishTests: Require Python3
Change-Id: I6e53b3bf90d4d125315e4fa8d0877e8b76b6b3c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-06 12:40:39 +00:00
Robert Löhning
0a4e671ab8 SquishTests: Update session dialog
Change-Id: I76919f48e2301c1815eaac39f81e42fa12f59a86
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-06 10:56:28 +00:00
Robert Löhning
997570cb29 SquishTests: Update kit removal function
The names of the kits don't change anymore before clicking "Apply".

Change-Id: I1477b419053f75c4f761561808fc4c6e5d21b19d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-06 10:44:58 +00:00
Eike Ziller
609510c323 Merge remote-tracking branch 'origin/11.0'
Conflicts:
	doc/qtdesignstudio/src/views/qtquick-designer.qdoc

Change-Id: I5d7ea23e356add0cbb2ad01ceb5e433377dc51c2
2023-07-06 09:49:11 +02:00
hjk
02ac595a2e LayoutBuilder: Add some playground for potential implementations
Change-Id: I0955c503dc03f9e4d81d6cfe4df7af63cf86a638
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-05 14:26:06 +00:00
Christian Stenger
cdea404957 SquishTests: Fix welcome page test
When the view is populated and sorted it gets its items
one by one. If multiple matches for opening an example are
possible we may end up using the wrong one which in turn
makes the test error out. So, wait for an expected amount
of items.

Change-Id: If6f6abfa757ede33311a8e617ab7d570df1240a4
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-05 11:57:05 +00:00
Christian Stenger
c6a8a76be0 Fix Qbs build
Change-Id: Ic02f12a08990bfa9eb3f0131141407373248bae1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-05 09:21:08 +00:00
Tim Jenssen
d9910058a3 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I91d9877ef6637d21e1106d6d363275295e6b55a3
2023-07-04 20:36:03 +02:00
Tim Jenssen
7fada70e8f unittest: fix linking problem on windows
Task-number: QDS-10245
Change-Id: Ie6baee6c9e5c8351fe67b2dd49ad4e80147ec48a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-04 16:49:43 +00:00
Tim Jenssen
48230d63b8 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts:
 src/plugins/qmldesigner/CMakeLists.txt
 src/plugins/qmldesignerbase/CMakeLists.txt
 src/plugins/qmlprojectmanager/CMakeLists.txt
Change-Id: If706ae3fe7a7d0e17036ce6285bec772d1f6127d
2023-07-04 16:22:32 +00:00
Robert Löhning
1487f1a0c0 SquishTests: Make sure tst_git_local cleans up properly
Creator still writes gitProject.pro.user after cleanup() ran.

Change-Id: I78c8247090a7032b21ee3a763fd390bb16f3d24b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-04 12:27:45 +00:00
Eike Ziller
a490625394 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ie4b1f249d1a5b7835022f367ee6b1c8a3c953f0b
2023-07-04 12:57:47 +02:00
Robert Löhning
c654e389c6 SquishTests: Update repository of Creator's sources to v6.0.1
6.0.1 was released on Qt 6.2 and was the last
version which could be built on Qt 5.14.

How I got to this:
0. Verify on Linux that the test passes with qbs 2.0.2
   from Creator 10 to have a combination which is known
   to work correctly.
1. Upgrade sources to v6.0.1 and write the tree which
   qbs 2.0.2 and Creator 11 generated from those.
2. Run the test with qbs 2.1.0 and Creator 11 and update
   the expected tree. This only meant removing a couple
   of lines.
3. Verify on Windows that the test passes with qbs 2.0.2
   from Creator 10 to have a combination which is known
   to work correctly.
4. Upgrade sources to v6.0.1 and write the tree which
   qbs 2.0.2 and Creator 11 generated from those. Remove
   all lines from the expected tree which were not found.
   Most of those contained forward slashes instead of
   backslashes.
5. Verify that the result passes with qbs 2.1.0 and
   Creator 11

Change-Id: I41579feb719324cf1fc605c73fe1d7566cf82202
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-03 14:08:17 +00:00
Robert Löhning
015b2f14fb SquishTests: Update expected tree of tst_opencreator_qbs
Disclaimer: I don't know why all those lines disappeared from the
tree. I only removed the lines which are not being found anymore
and updated a few more.

Change-Id: I916362247022b2ea84f5fa4255c6df6585311271
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-03 14:07:17 +00:00
Robert Löhning
eab484717b SquishTests: Configure Creator's sources on Qt 5.14
Change-Id: I973a34e16630050a500db70986a653c102a79da2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-03 14:04:58 +00:00
Eike Ziller
26e96bfad8 Merge remote-tracking branch 'origin/11.0'
Conflicts:
	src/plugins/debugger/debuggeritemmanager.cpp

Change-Id: I9d99d13feff9315f52eacbd84857c63cb69bf804
2023-07-03 10:24:09 +02:00
Jarek Kobus
1cbd417906 Utils: Remove functiontraits.h, mapreduce.h and runextensions.h
Change-Id: I61d0f95d4120c0de0045c1a817fd13a09eeb5402
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-30 10:00:12 +00:00
Jarek Kobus
80326d8743 FileSearch: Remove FileIterator and subclasses
Rename tst_SubDirFileIterator into tst_SubDirFileContainer.

Change-Id: I0907ff93f1d6537d200fdc9f5783cfd2a8eb0aa9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-30 09:58:10 +00:00
Marco Bubke
941e890804 UnitTests: Fix flacky tests
There were multiple reasons why the tests were flacky. First
Utils::reverseCompare had a bug. Now

std::lexicographical_compare(first.rbegin(), first.rend(),
                             second.rbegin(), second.rend())

is used.

Second the check StorageCache::checkEntries was not const. So it would
change the vector which it was iterating. So the iterator could be an
dangling.

Fixes: QDS-10197
Change-Id: I84fca6a2b24e1cae9fb85a01b6208de7e58240df
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-29 18:06:25 +00:00
Robert Löhning
0960156ada SquishTests: Fetch speedcrunch as needed
Change-Id: I4a2103bc58ae7ccdf4d728627f0346af40e6266e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-29 14:04:32 +00:00
hjk
627cb353f6 Unittests: Avoid warnings about warnings
smallstring-test.cpp:1538:32: warning: unknown option after '#pragma GCC diagnostic' kind [-Wpragmas]

Change-Id: Ibd3236734abd20c72a67efae0ab477cab6ae8b97
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-29 10:51:12 +00:00
Marco Bubke
f81ef9b2d6 Sqlite: Don't link to the internal Sqlite library
If you link to the internal Sqlite library you link actually twice. That
leads to strange bugs because you have an uninitialized object file. The
static linking workaround is now moved to cmake.

Change-Id: I51d966a623a18486ce5870d898999f3ce139f092
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-28 16:40:49 +00:00
Marco Bubke
b65ba2f702 QmlDesigner: Remove ProjectStorageSqliteFunctionRegistry
It is not used.

Change-Id: I7c2968a0a9876c04afffceedb87d46f19f0a7ace
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-28 16:40:44 +00:00
Wladimir Leuschner
b1c3a539b7 Debugger: Build simple_test_plugin as shared library
Build \tests\manual\debugger\simple\simple_test_plugin as shared
library. Omit `lib` prefix for shared library when building on Windows.

Change-Id: Ica0f1d098e1add34fb7860bc1dacfbd89495b031
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-28 14:22:27 +00:00
Christian Stenger
a6e5742569 SquishTests: Stabilize tests on macOS
Especially clicking the 'Do not show again' buttons on
the info bar on the bottom seems to be problematic
when trying to click them.
Wait for the clicked button to no more exist before
continuing to process further.

Change-Id: I24c40641e38dede2a689c34f491d68d4b7df8690
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-06-28 12:25:19 +00:00
Jarek Kobus
b5564b5820 FileSearch: Add tests for findInFiles() taking FileContainer
Change-Id: I752e8b443ac8a9c12b1fb209091727da6054a916
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-28 11:10:47 +00:00
Marco Bubke
f36062c084 UnitTests: Temporary remove function registry
The function is not used but triggers strange accesses to null pointer.

Task-number: QDS-10178
Change-Id: Iea51609f7b8956a98fe9391aef8edac899e14c03
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-27 16:27:18 +00:00
Eike Ziller
3e65778d66 Merge remote-tracking branch 'origin/11.0'
Change-Id: I8be5a00000a6699346ed1c44c0711d1f017462a7
2023-06-27 15:20:18 +02:00
Marco Bubke
5bd9721f01 UnitTests: Fix disabled test
Change-Id: I828ba785ac352a72b0fe7e3c3ea23c72df219fe5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-27 13:01:15 +00:00
Marco Bubke
90cfc2f7e8 QmlDesigner: Fix warnings
Change-Id: I2b9c2d024b1c09c157e448f590e2748337cbeb89
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-27 13:00:46 +00:00