Commit Graph

85691 Commits

Author SHA1 Message Date
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
Tim Jenssen
ec4c5a9a08 qmldesigner: fix assert
ASSERT failure in __cdecl QmlDesigner::AbstractProperty::AbstractProperty(const class QByteArray &,const class std::shared_ptr<class QmlDesigner::Internal::InternalNode> &,class QmlDesigner::Model *,class QmlDesigner::AbstractView *): "a property name cannot contain a space", file qtcreator\src\plugins\qmldesigner\designercore\model\abstractproperty.cpp, line 32

Change-Id: Ie991c86f172f4c1a5c70340f44b524b3e15cd5db
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-20 19:32:51 +00:00
Tim Jenssen
fe3c82de1c qmlpreview: fix crash
Change-Id: I862a02b24948435f700cf9284edb369a92ce584d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-20 19:32:15 +00:00
Jarek Kobus
012f926f7c BuildManager: Move some repeating code into buildQueueAppend()
Make it clear that calling init() on newly added build steps
are always followed synchronously by starting a build queue.

Change-Id: I9918b2e595cdb1d0639490e3edf77e67fb8ae52e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-20 15:59:10 +00:00
hjk
32850e7fcc ProjectEplorer: Base ToolChain on AspectContainer
Similar approach as done with ProjectConfiguration

Change-Id: Ia5e1d464b7c5c64d7a12ee12c7673ff453f24390
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 15:27:07 +00:00
Jarek Kobus
a38c8a88b2 BuildManager: Simplify buildQueueAppend()
Pass QList<BuildItem> instead of two separate lists
with build steps and their names.

Use "continue" when disabled or when init succeeded.

Move the "if (!init)" early return directly into the previous loop.

Append directly the passed items into the m_buildQueue.

Change-Id: Ie1bfc4e0695bf24d5bf25570523fed9b6b8c31e3
Reviewed-by: hjk <hjk@qt.io>
2023-07-20 15:25:48 +00:00
Marco Bubke
0533636758 Utils: Skip one temporary string in constructor
Instead of creating a temporary string we simply call append directly.

Change-Id: I75ffd80a4359a19892b196f5d1ddb50b90c5a2cd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-20 15:06:43 +00:00
hjk
c1309f9417 ProjectExplorer: Change ToolChain::toMap() signature
... to something similar to AspectContainer::toMap() as
preparation for later aspectification.

Change-Id: Ic60060ad1a7eb1aba58ded01221b016c684db073
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 15:01:52 +00:00
Jarek Kobus
580d605fd3 BuildManager: Add ParserAwaiterTask helper
Change-Id: I5c22b8a17d6495c3411e979e3e79cf9415236442
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-07-20 14:38:48 +00:00
Jarek Kobus
cd81336f40 BuildManager: Avoid code repetition in 2 "if" branches
Change-Id: If3ecb5457c2f7b661bed1c8daf80bf289204da15
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-07-20 14:33:06 +00:00
hjk
d5f754d456 BareMetal: Inline some simple toolchain function
Change-Id: I01112a82c1de101e16dfa262413dbac17400d375
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 14:31:16 +00:00
hjk
2b9882f563 BareMetal: Hide SdccToolChain definitions
Not needed publicly.

Change-Id: Iee1243c48d0b3308316bb6e7b4f4a34b0551f4ed
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 14:20:54 +00:00
hjk
e3dd3521d4 BareMetal: Hide KeilToolChain definitions
Not needed publicly.

Change-Id: I40272a26a450a10ada8e5d579dd6a2b5bd3c259a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 14:20:49 +00:00
hjk
048cd9d143 BareMetal: Hide IarToolChain definitions
Not needed publicly.

Change-Id: Id8250f32c64dbb53434082ae1d885b47f8a8d666
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 14:20:43 +00:00
hjk
7cc6078756 Utils: Let aspect transition functions indicate there was a change
Helps to make it easier to reason about the necessity of emitting
*changed signals.

Change-Id: Ieab29b25f5cc2799e193417b9cab02c99501c60a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-20 13:52:24 +00:00
hjk
11e1c7b1a4 Debugger: Move CommonOptionsPage to new settings scheme
Change-Id: I851931d3b0536659dc2e53a67b9879caad2f3166
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-20 13:47:24 +00:00
hjk
2f11a1d32b Utils: Avoid some FilePath::toString() uses
Change-Id: I7d6ee7739e14a25787ca661e10cc24fa6c536780
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 13:15:36 +00:00
Eike Ziller
934eb86d77 EditLocation: Use QByteArray directly
The `state` in the edit location is used to save the editor state, which
is a QByteArray, so there is no use in saving it in a variant instead of
a QByteArray directly.

Change-Id: I987a7d1bbb66b2cb1c1f4c7cfe0451742ea5bca2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-20 13:03:41 +00:00
hjk
9b0d90ec33 Help: Clean up constants definitions
Some unused, some style.

Change-Id: I3308e2c7a6a4ce861d32889682f4a57b45d4f894
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-20 12:37:12 +00:00
Eike Ziller
31312dc23e Examples: Re-add categories for sorting
that got accidentally lost while merging 11.0
because the code moved

Change-Id: I786d89f0909ccf5f3159a734b1d10d78e96904c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-20 12:35:32 +00:00
Eike Ziller
9dbd129ab6 Merge remote-tracking branch 'origin/11.0'
Change-Id: I39643590e2753a1079980e5f9fbcbc33318aa0a5
2023-07-20 13:17:09 +02:00
Henning Gruendl
bb635325e7 ADS: Integrate newest base repository commits
* Add drag and drop to auto hide

Base repository was merged until commit
65600a4dcd072fd2773b661823816db6392c34eb

Change-Id: I09dd6613869368d3cf0c701055a6972db915561d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-07-20 11:00:54 +00:00
Henning Gruendl
16ef838f23 ADS: Integrate newest base repository commits
* Update to newest version of ADS
* Remove native window and title bar support on linux

Base repository was merged until commit
8d4507e9d83434be976ff8c7bc9f59733937a08d

Task-number: QDS-10242
Change-Id: If74b6b50421be3b759c61b0f76f4a330991f71fa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-20 11:00:24 +00:00
Jarek Kobus
e8669653f1 Icon: Pass const reference to QList in c'tor
Change-Id: I8e009cdd29d08fc0dbcac3c812885779c928337c
Reviewed-by: hjk <hjk@qt.io>
2023-07-20 10:51:44 +00:00
hjk
635e8c1614 Utils: Introduce a FilePathAspect::expandedValue()
Currently and long-term synonym for operator(), to be used in
cases where (*this)() or such looks ugly.

Change-Id: I3f70ecd3298a1df394a0e3cc593917b4c7d36d82
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 10:39:43 +00:00
hjk
e8de9d44c9 Qmake: Use aspects more directly in QmakeBuildConfiguration
Change-Id: Ida1f62939242944e25986b71183164cd15c8de94
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-20 10:36:38 +00: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
Jarek Kobus
6cc471f38d Utils: Replace QVector with QList
Make usages of QList consistent. In some cases the
declaration contained QVector arg, while the definition
had QList arg.

Remove some unneeded includes of QList.

Change-Id: I7c15b39f261cefdeec6aaaf506ff4cc981432855
Reviewed-by: hjk <hjk@qt.io>
2023-07-20 09:57:07 +00:00
hjk
52ba040e60 Utils: Emit TypedAspect::volatileValueChanged when it changes
Change-Id: I9a2cf591955332453e6ff9d99c5e18249510599a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-20 09:40:42 +00:00
Marco Bubke
601308edcd QmlDesigner: Remove misplaced EffectMaker
I could not find any qml module for effect maker. So it will break the
meta info system.

Change-Id: I7a9593a3033e51cb3a0cc922a6f913dfee63338d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-07-20 09:39:14 +00:00
hjk
ddff28150d ClangTools: Convert two persisting values to aspects
Change-Id: Ida296c35f08951eaef698f53bceb705728f55aa9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 09:31:59 +00:00
hjk
b14b7b1a5f Replace a few more Aspect::value() calls with operator() uses
Change-Id: I9343e74bfb51af41df02a411976b82b9260be2fb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 09:31:09 +00:00
Leena Miettinen
6603c247d6 Doc: Fix reference to an image whose format changed to WEBP
Change-Id: I123af115096b17fdbe500af37f25704a45ad78a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-20 09:27:26 +00:00
hjk
7dfdb6d36c Android: Hide some manifesteditorwidget code in the .cpp
Change-Id: I4478cb2d85535c8d92aeef5e1e664e001d168ec5
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 09:09:38 +00:00
hjk
944a1e8a11 Android: Remove a few unnecessay Q_OBJECT
Change-Id: Ic57a7cfc58d741547cb793b24ff1358d900eaf5d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 09:09:29 +00:00
Leena Miettinen
a76f8cf4dc Doc: Change Extending Qt Creator Manual \page to index.html
It was extending-index.html to solve some issues that were
caused when generating the manuals from the same sources, but
those seem to have been solved. The name index.html was already
used at doc.qt.io for version 10.0.

Change-Id: I16c11d286107141f49cf28824cef998bd233d975
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-20 08:43:04 +00:00
Eike Ziller
3da1adc442 sdktool: Fix writing files
Fix an error when copying the file operations to sdktool.

resolveSymlinks was (basically) always returning an empty string.
Instead it should return the first file path that is not a symlink.

Amends bb4d9c92e7

Change-Id: Id6bfcc3332c14f074ab635e11ca0536b5326dbb1
Reviewed-by: hjk <hjk@qt.io>
2023-07-20 08:34:06 +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
Jarek Kobus
9f3e0db3e4 Unarchiver: Replace QVector with QList
Change-Id: Ib8a954f1b29ee475b645191424eb0e391dbb6baf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-07-20 07:14:48 +00:00
Jarek Kobus
6bb8bbabd2 Utils: Rename archive.{cpp, h} -> unarchiver.{cpp, h}
Change-Id: I0c3fdb68a15a6ad7419405d2bef86d4e75537df5
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-07-20 07:14:43 +00:00
Jarek Kobus
694c29d67b Utils: Get rid of Archive
Use Unarchiver instead.

Change-Id: I7544b36ca11578d7ae7eb8571e6fe823cf74dee1
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-07-20 07:13:42 +00:00
Jarek Kobus
cd8bb1d923 ExampleCheckout: Replace the usage of Archive with Unarchiver
Change-Id: I76550b618bcc631fc9575343eb4b8552cb21a018
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-07-20 07:13:28 +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
hjk
f10d0bad01 TextEditor: Push back explicit use of core settings
It's meant to be handled via aspects in the long term.

Change-Id: I2a2792f7bb5e75ede18e2328bb31729c212e30e6
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-19 14:00:39 +00:00
hjk
74ff10001a Squish: Set only category icon path in settings page
... instead of icon directly.

Change-Id: Ie16cb23323bd2ef90b5169ecc0bd8f4fb6d406f0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-19 14:00:30 +00:00
hjk
2b7e8599c8 CppCheck: Move widget creation for manual run closer to its use
Change-Id: I08d50f5e4534b8a58d374ae37bfd03dbd234a483
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-19 14:00:17 +00: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