Commit Graph

8032 Commits

Author SHA1 Message Date
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
Marco Bubke
d7ee848efd QmlDesigner: Improve NodeMetaInfo
Change-Id: I1b31a1b08332f6bdba74c46af3d0a190901e9607
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-27 11:54:02 +00:00
Tim Jenssen
623ee60611 UnitTest: disabled needs to be DISABLED
Change-Id: Id6e4cb898934bcc2993c1e402ce7741162e0ab91
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-27 09:04:58 +00:00
Tim Jenssen
53579298c5 UnitTest: add mock property "layer.effect"
Change-Id: Ibd9698b8e4a365818ff9e5a3233a08eb891325c8
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-27 09:04:49 +00:00
Semih Yavuz
012f984c27 Restrict M16 warnings
Do not warn out invalid property name if the property starts with an id
in the same component scope.

Small refactoring: Move early-return-likely elements up before any
calculations done.

Fixes: QTCREATORBUG-28468
Change-Id: I2cbdbc24af42f126db0bbd6027ebe4f96d9c199f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-06-27 07:21:58 +00:00
Marco Bubke
5d4dffdc89 UnitTests: Remove unused matcher
There are no clang test anymore.

Change-Id: I2140c4ff97e0351d627ec7b0f7306e0158fb95ca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-26 07:40:20 +00:00
Marco Bubke
57c4316e54 UnitTests: Fix dependencies
Change-Id: Ia5e3968aea4ae724f7554c2f7fa7223953236816
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2023-06-26 07:40:10 +00:00
Tim Jenssen
846f8dba92 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
  tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp

Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e
2023-06-22 14:50:56 +00:00
Eike Ziller
6479785c20 Merge remote-tracking branch 'origin/11.0'
Change-Id: Icb3ed8a1aaf31e8201a61d04221bfcb23a78562a
2023-06-22 13:09:00 +02:00
Marco Bubke
44565bc39b GoogleTest: Hard wire google tests
There were problems with older google test versions which were found
instead. Now the google test version is always the same and there cannot
be "strange" compile bugs.

Change-Id: Ib3dc74d1abbe369fb37a4ee5616011d8e3696c01
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-22 10:19:50 +00:00
hjk
de6fe3a63f Docker: Add a test container setup for Fedora 37
Task-number: QTCREATORBUG-28659
Change-Id: Ib8306525de186c51d8bcb53d466a6ac6dffb1c16
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-21 12:00:56 +00:00
Jarek Kobus
664d409489 TaskTree: Rename TaskAction into SetupResult
It's only used as a return value from group's or task's
setup handler. It instructs the running task tree on
how to proceed further.

It addresses the 21th point in the bugreport below.

Task-number: QTCREATORBUG-28741
Change-Id: I25802c76b9e7bc044c6a38197935798d2da9ad02
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-06-21 10:24:10 +00:00
Jarek Kobus
52badc2fa6 TaskTree: Fix calling the right group end handler
Make non-Continue TaskAction returned by group's start
handler take precedence over group's workflow policy.

Call the group's done handler when group's setup returns
StopWithDone and the workflow policy is FinishAddAndError.

Call the group's error handler when group's setup returns
StopWithError and the workflow policy is FinishAddAndDone.

Add tests for these cases.

Change-Id: I98210a5d522daabc0986200e65b25986a8c0c440
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-21 10:24:03 +00:00
Jarek Kobus
c17c696c1a Spinner: Add an example
Change-Id: Ie10fcc1aa6e31c663296610391d5453792c46a6f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-20 18:48:28 +00:00
Marcus Tillmanns
9f5a0e3834 Utils: Fix CommandLine macro expansion
Moves macro expansion before assembling the command line
to correctly quote the resulting arguments on windows.

Change-Id: I62eded9376977ec6095e8648296cd2af53eb8e82
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-06-20 08:49:44 +00:00
Eike Ziller
0f9b118776 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ib798dc9922c01b7667388ca03d3a248610f73028
2023-06-20 10:36:06 +02:00