Commit Graph

81276 Commits

Author SHA1 Message Date
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
David Schulz
87d1865f99 Copilot: ignore invalid or empty suggestions
Change-Id: I6765814ec74b456ad1bb1392472d9d488357582e
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-13 08:40:30 +00:00
Artem Sokolovskii
6a20e588bf ClangFormat: Use pre-existing code style settings
Instead using of default code style settings, this commit
modifies the ClangFormat plugin to use the code style
settings that were set before applying ClangFormat.
By doing so, we preserve the previously defined code style.

Fixes: QTCREATORBUG-29185
Change-Id: I347d44d5ed49a2c50e130a983b62c844c8964391
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-13 08:10:46 +00:00
Marcus Tillmanns
2edaf459bd Utils: Support relative path for PtyProcess
Change-Id: I8af96e51a4b75c192f5fab339449f4d07b1a040a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-06-13 07:40:41 +00:00
hjk
ddc30f4b9f GenericProjectManager: De-QObjectify GenericBuildConfiguration
Change-Id: I29ae16c04f17a134363a64532cc160d58127f34d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-13 05:36:45 +00:00
hjk
05294ad701 Meson: Build page optics
Align form, remove unwanted padding.

Change-Id: Ia0f8108a8a8d68df4eb7326de813223b2bd23df9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-13 05:36:10 +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
Cristian Adam
42fff6e27e CMakePM: Add support for block/endblock functions
The block() / endblock() functionatlity has been added to CMake version
3.25.

See https: //cmake.org/cmake/help/latest/command/block.html

Change-Id: If6458b84c3e30c4d4d8cbd3d3f1c661e8ffa869c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 13:39:59 +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
904fa0aca3 CMake: Check for CMakeCache.txt also in remote builds
Change-Id: Ide179188a7fbd10b122a6bb34de08f943324133f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-12 13:18:57 +00:00
hjk
f19481e6c7 Utils: Make FancyLineEdit placeholder validation optional
Validation makes only sense if the placeholder is similar to
the actual contents, like a file path, not for explanatory text.

Amends 3dcdbe9.

Change-Id: I81ff7a3cf72f28c0fe49824b574b0997ada2d09b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-12 13:17:17 +00:00
hjk
d0cf49db47 Debugger: Handle some Qt deprecation warnings
Change-Id: I93c9f91642bc5f5bd43ebb80cb489782978db327
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-12 13:16:07 +00:00
hjk
27762d2dcf QmlDesigner: invert check on QmlDesignerProjectManager::activeTargetChanged
The pointer is accessed unconditionally directly afterwards.

Change-Id: Ie6080fc35bc05891cc103fcd32e032d72687230a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-12 13:14:46 +00:00
Cristian Adam
9c8acbf40e CMakePM: Fix MSVC assertion with tests/manual/cmakepresets
Change-Id: I5f06d69b444e453456f2dd9822006b535d3f7843
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 13:10:30 +00:00
Marcus Tillmanns
d491faf94a Utils: Send ack from Process stub
Allow the server to listen for command results.
Fixes Qt Creator hanging when stopping application
being debugged.

Change-Id: Ia175b1bb1836b5593bc073394fa152923e1dda28
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-06-12 12:13:02 +00:00
Christian Stenger
97a97b3019 QmlJS: Fix initializing static analyzer
...when using a customized analyzer that has no customization.
If there is no customization we do not store the value inside
the settings, so we get empty lists instead of the default
lists for disabled messages.
Amends 427640063e.

Change-Id: Idea560176b0a9caa93dca7a3a2d01cc3aa3a6d2f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 12:05:04 +00:00
hjk
860b204e38 Revert "Android: Handle some Qt deprecation related warnings"
This reverts commit a69ee57396.

Too early: QDomDocument::ParseResult was only introduced in Qt 6.5.

Change-Id: Ia2590a3f8ce5b9edec21b222d5c9211572563f97
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-12 11:59:59 +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
890debd658 Fix lupdate issues
Some failures to find the right tr() without fully qualifying

Change-Id: I6566786dc93b07dcf01f3bdce83ebd404f4fd6e8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 10:25:21 +00:00
David Schulz
a0969feadf Python: use one line for each file in the template project files
Change-Id: I4fd921b11a488346cd3b53c9953881111c664764
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-12 09:54:24 +00:00
hjk
a69ee57396 Android: Handle some Qt deprecation related warnings
... in manifest editor.

Change-Id: I7e33f6e96ef88c8a5fb3f5d509bccab9ceebe799
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 09:45:46 +00:00
Miikka Heikkinen
6652996503 QmlDesigner: Fix puppet build after quick3d private API changes
Change-Id: I3668853886306fe00d5da916aa458559964a9af0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 9817df63fb)
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-12 08:39:41 +00:00
Marcus Tillmanns
dd28fb438f Debugger: Pass runAsRoot to terminal applications
Fixes: QTCREATORBUG-27519
Change-Id: I66478b5e68aee55c929fe2b7785973b8e7167fbf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-12 08:09:23 +00:00
Marcus Tillmanns
11ec14ebf4 Utils: Dont auto add sudo to all processes
Terminal processes need to add to the stub and not the target app,
so sudo is only automatically added for default processes.

The terminal interface is changed such that sudo is added to the stub.

Task-number: QTCREATORBUG-27519
Change-Id: Ife11e937644c4e946401a5b079e90fa64aee2c52
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-12 08:09:04 +00:00
Jarek Kobus
52fba04af5 TaskTree: Replace usages of Async with ConcurrentCall
The ConcurrentCall is more appropriate, since it's
a part of the Tasking solution.

Change-Id: I1a993a6afa552a7a6a26a450d4f23c15443fdfde
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-06-12 07:50:52 +00:00
Jarek Kobus
814fbd1c4f TaskTree: Some docs / string fixes
Change-Id: Ia87c519c7ab75b0bef86081c77c9408aa2694712
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-06-12 07:50:43 +00:00
Yasser Grimes
febfa73d29 McuSupport: Add an empty MCU project template
In addition to the descriptive Qmlproject base template containing
hints about most possible configurations, this template is intended
to be as blank as possible for a cleaner project configuration for the
case where the properties already known by the developer.

Task-number: QTCREATORBUG-29192
Change-Id: I670bc502ba30d5297668c77004ddfdf756764809
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 07:30:39 +00:00
hjk
dde5f1aab0 Utils: Fix compilation with namespaced Qt
Amends 5644fa1b9c.

Change-Id: I4e9ce4a637672fece8884d88c87fc8aaee7d9cc3
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-12 07:26:55 +00:00
hjk
c13cf76249 Utils: Fix a Qt deprecation warning about pixmap and devicePixelRatio
Change-Id: I7a47054fcf68bc59263182fd1a7213354a07e31d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 07:10:52 +00:00
hjk
2fa78c7b9f ClangFormat: Proliferate FilePath use
Change-Id: I82ea75be92a7b247bad9717bf167cda8bb72cae7
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-12 07:10:32 +00:00
Christian Stenger
c377794c35 QmlJSEditor: Change way of writing settings for static analyzer
Instead of writing out a binary blob use a string list when
reading or writing the settings.
The setting is introduced with QC11 the first time, so this
should not harm too much - therefore no transition of old
settings have been added.

Change-Id: Ica4654f49b71478cb07434dff9d42fd9562be87b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 07:05:12 +00:00
Eike Ziller
db680ebbb6 Bump version to 11.0.0-beta2
Change-Id: I336891b48940457ad878a9c35799e1e8eabae6a0
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-12 06:51:26 +00:00
Eike Ziller
fafd24a616 Change log: Add links to the bugreports
And prevent that the internal log viewer replaces the bug items with
links if they are already within a link.

Change-Id: I115fd9be59d0394a91b3bcd3157083e30d44c6b5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 06:10:03 +00:00
hjk
14d8f1573d Beautifier: Proliferate FilePath in uncrustify
Change-Id: I1790a96c50d7ac419a6f33ba9d0c42619ba4fd2e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-09 13:14:37 +00:00
hjk
37095e0f96 ProjectExplorer: Handle more Qt deprecation warnings
Change-Id: I6b6c24e17fce369324749a47ae2aa8a1ab4afb31
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-09 12:24:05 +00:00
hjk
a1bf748e95 Beautifier: Proliferate FilePath use in settings
Change-Id: Ia3b5c3cdde6f95d763269038a5df3930effaf7b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-09 12:22:58 +00:00
Christian Kandeler
d12cfaaf7a Update qbs submodule to HEAD of 2.1 branch
Change-Id: I82c5e3fc6850647e30a557552adfeb29934f0633
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-09 12:09:24 +00:00
Alessandro Portale
50c386b53a Translations: Call Tr::tr() where it should
Change-Id: Ibf2be8a9aabd0a4e8e763a96901feaaa6eda2f3e
Reviewed-by: hjk <hjk@qt.io>
2023-06-09 12:04:26 +00:00
hjk
005a26d0ae QmlDesigner: Inline richtexteditor.ui
Change-Id: Ifc0c621485fb8fff4ce03e41bb9eb15bc3cc75eb
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-06-09 12:01:30 +00:00
David Schulz
1916f42690 Python: allow remote browsing for python interpreter
Change-Id: I4d8c92d4fa63b90b95bea454198d33839485868e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-06-09 11:37:34 +00:00
David Schulz
8d733f95e6 Python: simplify project file saving
use QJsonDocument to save the new style project files. This improves the
formatting and prevents replacing the newly introduced qml import path
field. Also used FilePath::fileContents/writeFileContents to support
remote projects.

Fixes: QTCREATORBUG-28541
Change-Id: Ie614726b6775dad2361437dc5d410438c7d01141
Reviewed-by: hjk <hjk@qt.io>
2023-06-09 11:37:26 +00:00
David Schulz
45acf2d49e Python: Use FilePath for absolute paths to project files
Change-Id: Ied4db237fe6a3b9532fced7c575a8a3717b405fc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-06-09 11:37:20 +00:00
David Schulz
d548c973cf Python: use the system environment of the project dir
to expand variables in the python project files.

Change-Id: Iff8d2445bad9a7ae15e720b65ac5c894c8efdb02
Reviewed-by: hjk <hjk@qt.io>
2023-06-09 11:37:12 +00:00
David Schulz
4fa65c4a34 Python: unify reading project files
Also support remote file paths for old style project files and do not
change order of files in the new project file.

Change-Id: I49b0781b26ca33b605aef674a04ee676f1848986
Reviewed-by: hjk <hjk@qt.io>
2023-06-09 11:37:06 +00:00
David Schulz
6eca1f5dc8 LanguageClient: improve inspector layout
Replace the list widget to switch between servers with a combo box on
top of the inspector to gain horizontal space for the actual
information.

Change-Id: Ic50d5dd6a44eeea43caa3d3f9cee621b58d44306
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-09 11:17:09 +00: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
hjk
790cabade1 Incredibuild: Fix quoting of additional command line args
Change-Id: I215c330e79b4df6a2b65f774a4e8d7d1a7157973
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-09 10:20:47 +00:00
Christian Stenger
59fe58a60a PE: Fix build step layout
Change-Id: I3c3ddc6a20d3233a85499a946bf21f284531f8df
Reviewed-by: hjk <hjk@qt.io>
2023-06-09 10:18:52 +00:00
hjk
35c60cd7b4 Incredibuild: Auto-register aspects in build steps
Change-Id: Ic36ac230c92df4b18649aa19a57f7a424a593db3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-09 10:15:30 +00:00