Commit Graph

8097 Commits

Author SHA1 Message Date
Tim Jenssen
91a931dd21 QmlDesigner: build it only if Qt is GREATER_EQUAL 6.4.3
Change-Id: Iccd05a7d4f4ace47fd9398bdc78584e3919ec595
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-15 18:57:48 +00:00
Marco Bubke
0f7462ad24 QmlDesigner: Fix dependency
Change-Id: Iccf3f80e9dd5c9a9dc49c363f9099352732bab60
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-15 16:14:33 +00:00
Marco Bubke
dadb9074ed UnitTests: Improve matcher
It should work for pointer and non pointer.

Change-Id: Ib80a58874282191b0cbaa576e8846f43d674ce9d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-15 15:18:28 +00:00
hjk
123793fbb1 Utils: Add an 'If' LayoutItem
Change-Id: I700e28d03b6dc39e96fa969152f236760989bdb7
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-15 13:03:11 +00:00
Tim Jenssen
8812c1816b Merge remote-tracking branch 'origin/11.0' into qds/dev
Change-Id: I23063e42621b272bd4b04a06746955e6b5768b49
2023-08-15 12:32:47 +00:00
Marcus Tillmanns
5ae116618e Tracing: Remove useless code
runSceneGraphTest() did nothing but create an opengl context and
offscreen surface. It did nothing with the provided QSGNode.
The only thing it does is make the test fail if the opengl context
can't be created for instance on test machines without opengl.

Change-Id: I376c3565f5afcee6e123a7ef8b9832e679e645a0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-08-15 11:04:36 +00:00
Marcus Tillmanns
324e924178 Utils: Fix FilePath::isRootPath()
Change-Id: I287bae74469ba501ecb03d51f04f7aaa5f4a7268
Reviewed-by: hjk <hjk@qt.io>
2023-08-15 10:50:24 +00:00
Jarek Kobus
93c30c4586 UnixDeviceFileAccess test: Add a note about the usage of QProcess
In order to prevent any possible further conversion.

Change-Id: I0f8be7558affb36b3015144fe9c640a7bfcab295
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-15 09:06:37 +00:00
Jarek Kobus
5bce234986 Valgrind: Refactor Parser
Make it implicitly threaded.

Get rid of ThreadedParser.

Don't move QTcpSocket instances, received by
QTcpServer::nextPendingConnection(), into another thread,
as docs says it's not safe.

Use wait condition for waiting for new data.

Don't potentially leak the Parser in loadXmlLogFile():
store a unique pointer to the running parser.

Introduce Parser::setData() method and use it with
QFile device in loadXmlLogFile().

Pass QAbstractSocket into the parser instead of
QIODevice and get rid of downcasting. The QIODevice
couldn't really work with non-socket and non-file devices
(like e.g. QProcess), as it lacks general error and finished
reporting signals (it has only general readyRead() signal).

Change-Id: I9352aec694564d4d2a26898841ed964bed470d82
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-08-14 14:42:16 +00:00
Christian Kandeler
74a0313fcf CPlusPlus: Support associating comments with a declaration
This will serve as the basic building block for several comment-related
features.

Task-number: QTCREATORBUG-6934
Task-number: QTCREATORBUG-12051
Task-number: QTCREATORBUG-13877
Change-Id: Ic68587c0d7985dc731da9f539884590fcec764de
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-10 14:26:27 +00:00
Marcus Tillmanns
973f74bad3 Tests: Add NEEDS_GUI flag to add platform argument
Tests that create a QApplication need to be started with
"-platform minimal" so that they won't fail on build servers
without Display.

This also keeps them from distracting you if you run them while working.

Change-Id: I05df258b2204a3abd3cdea446d6a52f3e57a4a62
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-10 12:15:12 +00:00
Marcus Tillmanns
cb50a67521 Utils: Fix FilePath tests
Change-Id: I2751cd9393baa836715f778a9bcbc47a445c264c
Reviewed-by: hjk <hjk@qt.io>
2023-08-10 10:48:40 +00:00
Jarek Kobus
98aacfd688 Debugger tests: Bump min cpp version to 17
Change-Id: I0fa3c153d1533f7f0390134d4b046e00c0368d9d
Reviewed-by: hjk <hjk@qt.io>
2023-08-10 09:24:20 +00:00
Jarek Kobus
3970a834bc Valgrind: Replace global toolTipForFrame() with Frame::toolTip()
Change-Id: I66cc481d588c468b9388e3b3863ed35aab406fa2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-08 15:10:47 +00:00
Jarek Kobus
91f01c17f9 ValgrindRunner: Hide ThreadedParser
Expose its signals instead.

Change-Id: I0daeb2e510c30678f4f13d880bc8108510c4f32e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-08 09:23:08 +00:00
Jarek Kobus
66929b96a4 Debugger test: Get rid of foreach
Change-Id: Ia3414cffe9b88cfb5abbdd24eda5c36aa163c4f9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-07 12:42:16 +00:00
Jarek Kobus
8819034e04 tst_dumpers: Verify that debugger has started OK
Change-Id: Icb2c9ff2f56ac959ce3b87ff333a9f58fd146464
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-04 09:51:27 +00:00
Eike Ziller
c9ba87b58b Merge remote-tracking branch 'origin/11.0'
Conflicts:
	src/plugins/beautifier/clangformat/clangformatsettings.cpp
	src/shared/qbs

Change-Id: Ie614f036ef9529a3cae6366a9313eded988d725c
2023-08-03 11:35:17 +02:00
Jarek Kobus
9680b8434e Tests: Simplify return statements
Change-Id: I9609609f0f880654b73e8930cd05818ddf9b7152
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-02 11:30:20 +00:00
Jarek Kobus
0bdf6f2a50 WaitForBarrierTask: Don't derive from BarrierTask
The CustomTask<Adapter> isn't really meant to be derived from.
Provide a global function instead.

Change-Id: I8cfde260e638a34fa675126f3f412faab902e94a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-08-02 10:27:41 +00:00
Jarek Kobus
47fce17aa3 Tests: Add context object into connections
Change-Id: I4bb05e5890b9b415085f17d6358d9066e3112d6d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-02 08:40:08 +00:00
Jarek Kobus
925bb2ca31 Various Plugins: Simplify return QStringList statements
Change-Id: Id014225851e6b9f8436387c681bea42e5de3b797
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-02 05:38:31 +00:00
Jonas Karlsson
404bf9547f Update QtQuick3D.Physics.Helpers qmldir
Task-number: QTBUG-115539
Change-Id: I6d44ebe64dd32d1f2c1575ce4cbc84c01d3588f7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-02 00:45:57 +00:00
Robert Löhning
b366757502 SquishTests: Expect failure when renaming class
Task-number: QTCREATORBUG-29012
Change-Id: I3b6955d73c4908332c509d71a19afed60c2f42da
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-31 11:43:01 +00:00
Orgad Shaneh
4ad3925da4 Merge remote-tracking branch 'origin/11.0'
Change-Id: I5cdff1f5db3fae89beef3d27316b21440541bb1c
2023-07-30 16:24:15 +03:00
Robert Löhning
178b490997 SquishTests: Adapt test of navigation tree
Extends b57f72e3c8 to another test.

Change-Id: I419ce4fb05667fd22a1e913ef7122b191e12a34a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-28 12:34:36 +00:00
Christian Stenger
6b39020295 SquishTests: Fix expected proposals
Change-Id: Id835185e621fac6adba3e1db15d1a3d782b571df
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-28 11:26:08 +00:00
Robert Löhning
b95aba56b5 SquishTests: Don't use lists of dicts
...when that doesn't have any advantages.

Change-Id: I0c58e30ae0b9e278e3336646332279f6243719d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-27 11:52:25 +00:00
Christian Stenger
b57f72e3c8 SquishTests: Adapt test of navigation tree
Explicitly disable loading ClangCodeModel plugin to avoid slowing
down the load and parse of the projects by the indexer as we are
measuring the time for these.
Beside this adapt the expected tree for macOS - there are a couple
of files and subtrees that are present only conditionally.

Change-Id: Ibc000d0908e652700820f8eee4b17effdf48f637
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-27 11:48:26 +00:00
Robert Löhning
a521114519 SquishTests: Don't initialize an entire list for reading one item
The point of Python3 returning objects instead of lists is that
it will iterate just as far as items are actually being used.

Change-Id: If4d9742bb47aa9cac1166a0ff6f10d211829fd85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-27 11:41:40 +00:00
Christian Stenger
4a8c08a349 SquishTests: Skip too old Qt on Windows
When creating a command line project from wizard we end up
with code that is not compilable on Windows when using too
old Qt versions. Explicitly do not use the older Qt versions
as this fails to build and the whole tests would need to get
adapted to handle this appropriate instead.

Change-Id: Ia8a253a0c5d8d20ea181dd33dc8d31cb83cb31c3
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-27 10:37:50 +00:00
Christian Stenger
488f1b3d11 SquishTests: Adapt cmake based speedcrunch test
Change-Id: Ic4c22311828f2c0364cbc514b98d2cb4e7d1b86a
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-27 10:29:43 +00:00
Marco Bubke
d59d27e16b QmlDesigner: Add property meta info tests
The cast function is now returning an invalid variant if the meta info
is invalid. It is too not anymore converting the value magically.

Task-number: QDS-10290
Change-Id: I125aab9ac46c9ac0605364ede32fb1a10d20cd89
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-26 08:57:35 +00:00
Eike Ziller
08bbe885b4 Examples: Support manifest-defined category order
Reads a separate sorted list of categories from the manifest files.
The first of these lists that is found in the manifest files is used.
For example the Qt documentation defines the list in the manifest file
for qtdoc.

Change-Id: I57c2779862a5ebfc27707b53d43d4ed9e7e8c5f9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-24 11:02:18 +00:00
Christian Stenger
a263d3de89 Tests: Fix cmake build
Change-Id: I1e42c0361aa92b54e52ba2c29f26f3f3f600e898
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-24 06:26:25 +00:00
The Qt Project
d9c30e41c3 Merge "Merge remote-tracking branch 'origin/qds/dev'" 2023-07-21 12:13:26 +00:00
Tim Jenssen
7df557c0ba Merge remote-tracking branch 'origin/qds/dev'
Conflicts: tests/unit/tests/printers/gtest-creator-printing.cpp

Change-Id: I5f791161ca1a2966e98a3ca55bc60e5bcbb8f58f
2023-07-21 10:20:45 +00:00
Marco Bubke
3d7f1a0f7f UnitTests: Optimize example string generation
Change-Id: I9cc17269812dd9a61b192598f947e2754673c96e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-21 10:07:19 +00:00
Christian Stenger
760b8d7139 Tests: Fix qbs build
Change-Id: I12757ef3bccfad3fc6da4f2d22a24e3c4d92a71f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-07-21 07:21:24 +00:00
Tim Jenssen
8cde647972 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts:
  doc/qtdesignstudio/src/views/qtquick-designer.qdoc
  src/plugins/studiowelcome/stylemodel.cpp

Change-Id: I13c9e4e9404619d7ba649eae160774aafc042610
2023-07-20 22:18:47 +02:00
Eike Ziller
9dbd129ab6 Merge remote-tracking branch 'origin/11.0'
Change-Id: I39643590e2753a1079980e5f9fbcbc33318aa0a5
2023-07-20 13:17:09 +02:00
Marco Bubke
21983a8377 Utils: Fix SmallString::append(QStringView string)
It used the size of the destination string but it had to use the size of
the appended string to inquire the maximum required size.

Change-Id: I1c910abab0ac60ed5fec1b3dc3a358e438532281
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-20 10:30:25 +00:00
Christian Stenger
cd971160c3 SquishTests: Adapt to different ui approach
Using the window title property on macOS is not reliable
as message boxes do not get any there. Use the expected
text of the message box instead.

Change-Id: I36dc865dcce6ba98643f0174887de12c197b3222
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-20 08:14:38 +00:00
Christian Stenger
d53a743262 SquishTests: Fix used short cut on macOS
Modify used short cut on macOS again. This tends to break
depending on OS version, underlying keyboard layout and
maybe even more causes.

Change-Id: I79b0e281128b8f779307782038aa9fb42510b633
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-20 08:14:29 +00:00
Christian Stenger
b44a7817b8 SquishTests: Handle codec problems
Reading files depends on the system encoding and will
return a bytes object instead of a str even for text files
on some Windows setups.
Handle this by explcitly converting to str if needed.
Handle possible decoding issues by falling back to UTF8
encoding when running into decoding error while decoding
on Windows.

Change-Id: I8c1f24ff052710e4b1927399d54e321088e3b171
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-20 08:14:10 +00:00
Eike Ziller
626378de2d Merge remote-tracking branch 'origin/11.0'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/qtsupport/examplesparser.cpp

Change-Id: I2a0808261969e8c7cef7fae86d9027a155bf9b14
2023-07-19 16:10:37 +02:00
Christian Stenger
182104e013 SquishTests: Adapt to different texts on macOS
Change-Id: Ie97003fd7de907d1a0f3ac71d6244dd68e2bf833
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-19 13:44:16 +00:00
Marco Bubke
e46eb57543 UnitTests: Add more matcher
The IsEmpty and IsNull matcher have been extended to be more generic.
QVaraint matcher have been added.

Task-number: QDS-10290
Change-Id: I34fcb0571190dd37e7706587ee617e1301f9f841
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-19 13:17:44 +00:00
Christian Stenger
6614abe549 SquishTests: Adapt to Python 3
A dict's values object is not a list as it had been in Python 2.
Explicitly convert it.

Change-Id: Iab54a5833b77c6890b108065657da3ff73c96f7f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-19 08:57:08 +00:00
Marco Bubke
90b0fd2869 UnitTests: Fix warning
Change-Id: I834095e1e8f40cb063b6014e98bf79ae8d8e439b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-18 15:12:22 +00:00