Commit Graph

8014 Commits

Author SHA1 Message Date
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
Marcus Tillmanns
6c34e1937c Utils: Fix operator escaping
Stops CommandLine / ProcessArgs from escaping
operators '&&', '||' and ';'.

Fixes: QTCREATORBUG-29280
Change-Id: Idf4f429fec0d96b67266761297eea851c283ac4c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-20 06:23:37 +00:00
Tim Jenssen
910e12a2a3 tests: remove manuel uisplit tests
They were using Quick Controls 1

Change-Id: Idc60e648d65445538defaa1c3f4e28d67581b902
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-19 15:37:57 +00:00
Eike Ziller
f88db30319 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ibb433d3e1ea2c0632dd2f710c8ec995de7599978
2023-06-19 10:08:56 +02:00
Robert Löhning
012f67baf1 SquishTests: Update keyboard shortcut GroupBox
Change-Id: I168e6128f61b6363253c5ed999a29b1f64441cff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-15 11:16:29 +00:00
Robert Löhning
c6e2e93bc0 SquishTests: Remove workaround for fixed issue with open terminals
This reverts commit 4c5163f675.

Task-number: QTCREATORBUG-15749
Change-Id: Icefdfe2f7e4f818f3407854619d4c6a395084af2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-15 11:15:59 +00:00
Eike Ziller
6c601b8cd4 Merge remote-tracking branch 'origin/11.0'
Change-Id: I8d1c9720a868da02b3157a48954eb4e262539c84
2023-06-15 09:48:58 +02:00
Eike Ziller
68915713bf Merge remote-tracking branch 'origin/10.0' into tr
Conflicts:
	src/shared/qbs
	tests/system/suite_general/tst_opencreator_qbs/test.py

Change-Id: I683ebb489e7c2112b343bb3631f6343fdc84cc4a
2023-06-15 09:43:24 +02:00
David Schulz
9091c99429 TextEditor: correctly highlight preedit text
Fixes: QTCREATORBUG-29134
Change-Id: I8c5cdab8c5b2e5a2380c9e4aeadaf1bd72e60e09
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-14 10:05:12 +00:00
Eike Ziller
e7870f736d Merge remote-tracking branch 'origin/11.0'
Conflicts:
	src/plugins/clangformat/clangformatutils.cpp

Change-Id: Ide285cc25fca9101843ab9dca01c5a33644aca7f
2023-06-14 08:43:08 +02:00
hjk
0415bea736 Tests: gtest unittest: improve compilability
... with recent (namespaced) Qt dev.

[...]tests/unit/unittest/3rdparty/googletest/googletest/include/gtest/gtest-matchers.h:184:14: error: invalid conversion from 'const char*' to 'ushort' {aka 'short unsigned int'} [-fpermissive]
In file included from /data/dev/qt-6-ns/qtbase/include/QtCore/qstring.h:1,
                 from /data/dev/qt-6-ns/qtbase/include/QtCore/QString:1,
                 from /data/dev/creator-out/src/libs/utils/smallstringview.h:9,
                 from /data/dev/creator-out/src/libs/utils/smallstringliteral.h:8,
                 from /data/dev/creator-out/src/libs/utils/smallstring.h:8,
                 from /data/dev/creator-out/src/libs/utils/smallstringvector.h:8,
                 from /data/dev/creator-out/src/libs/utils/smallstringio.h:6,
                 from /data/dev/creator-out/tests/unit/unittest/gtest-creator-printing.h:7,
                 from /data/dev/creator-out/tests/unit/unittest/googletest.h:17,
                 from /data/dev/creator-out/tests/unit/unittest/externaldependenciesmock.h:6,
                 from /data/dev/creator-out/tests/unit/unittest/modulescanner-test.cpp:4:
a/dev/qt-6-ns/qtbase/src/corelib/text/qstring.h:1006:61: note:   initializing argument 2 of 'bool Ns::operator==(const Ns::QString&, Ns::QChar)'
[104/1218] Building CXX object src/plugins/coreplugin/CMakeFiles/Core.dir/locator/executefilter.cpp.o^C

Change-Id: Id8d4533b9e53d7aa81edc64a99df31dd1d6ac5bf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-13 08:41:23 +00:00
Christian Stenger
b97698edfc SquishTests: Adapt test for Qml debugging
Change-Id: I86271f5e204ef7532b804b53b2cfba9c3ae823d0
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-06-12 14:03:17 +00:00
Robert Löhning
fe9e5cc42f SquishTests: Get editor's real name while it is still visible
...or Squish might find something unrelated.

Change-Id: I08f9077ac3f919eeeb641eab70738e052bc60cee
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-12 13:33:40 +00:00
Robert Löhning
9f89b87517 SquishTests: Update tst_WELP04
Change-Id: I0fd52a1ab0538765736927bcca32e5b1e26f6c1d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-12 13:32:57 +00:00
hjk
3d4621c531 Utils: Fix compilation with namespaced Qt
Change-Id: I5e9ce4a637672fece8884d88c87fc8aaee7d9cc3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-12 11:50:29 +00:00
Eike Ziller
ea56417410 Merge remote-tracking branch 'origin/11.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: Ide0650d70d5dbd32a5492c8db24089925251af12
2023-06-12 12:33:26 +02:00
Eike Ziller
3381a6219a Debugger test: Automatically sign on macOS
The "gui" manual test is used for release testing attaching a running
application and a core file to the debugger. For this, the application
must be signed with the right entitlements.

Since ad-hoc signing is sufficient, this doesn't require any setup on the
testers computer. So, make this signing automatic.

Change-Id: I7042a3091848ee1c9f7f3843507f3ca616d36179
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-09 11:02:42 +00:00
Eike Ziller
375db16ac4 Merge remote-tracking branch 'origin/11.0'
Change-Id: I87b22a73427cf9fc1b96075dc0db769ed3d3621c
2023-06-09 11:24:29 +02:00
Tim Jenssen
66263782ec Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts:
  src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
  src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
  src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I4c8a33736b25c3bb24241224d0a1e7358bb7fd94
2023-06-08 16:35:56 +02:00