Commit Graph

2612 Commits

Author SHA1 Message Date
Marcus Tillmanns
f13d9cc736 ProcessStub: Wait for detach to finish
Without calling waitpid() after detaching from the inferior
a race condition could occur where the ptrace(...) call would
finish before it was actually detached, leading to the following
gdb to fail attaching as the stub was still attached to it.

Calling waitpid here solves the race condition.

Fixes: QTCREATORBUG-29463
Change-Id: Ia1d79a18a96078bbf72589bebbc7d7ac027dea0d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-10 08:14:29 +00:00
hjk
0be0772fc9 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ib67c8ecb1865ee31ca6485c9287039ba877c68cd
2023-08-10 10:03:04 +02:00
hjk
578ecfc846 SdkTool: Don't destroy :// parts in qmake paths
Change-Id: I1b8fef656550b7d2e59e6a606728d0f3e85d5af2
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-09 11:32:57 +00:00
Miikka Heikkinen
a05ba1696f QmlDesigner: Fix orthographic camera zoom
Scale no longer affects cameras, so use magnification instead to do
orthographic camera zooming.

Fixes: QDS-10241
Change-Id: Ic31abfdf741369a494b8178109fa1c5b95fbdd1c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-08-08 11:27:54 +00:00
Jarek Kobus
33d628f111 PerfParser: Update the tool
Change-Id: Ie79c28b39f62af91843106bc1e312d6be27ba9cf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-07 12:26:34 +00:00
Jarek Kobus
aa016cc5a7 Various Plugins: Add context object into connections
Change-Id: I360677bebfef16a3233b3b8177cff6da57ec7c31
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-02 08:55:37 +00:00
Jarek Kobus
eb2b4b6cf3 Various Plugins: Simplify return QList statements
Change-Id: I36633128e061d0544e4752a65804b460371283f7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-02 05:38:14 +00:00
Miikka Heikkinen
b051606ed2 QmlDesigner: Fix build without quick3d
Change-Id: I6a9ddebfc994dc187e837059c45e9b069ff743cc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-31 08:31:32 +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
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
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
Marco Bubke
e204af5cac QmlDesigner: Modernize Enumeration
Save some allocations and return a view instead of a new value. If you
want a value because you depend on a null terminated string you have to
use toScope() and toName().

Task-number: QDS-10290
Change-Id: Ia87b8d559fc1fe9bb1992e61da0aa86c68d53535
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-19 13:16:44 +00:00
Alessandro Portale
b5808cdd56 Solutions: Enable theming and dpr for spinner images
Change-Id: I2105b9c1032940d26f3f3bf2083f88e1133e8757
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-17 12:14:32 +00:00
Christian Kandeler
fdc834c0d1 CPlusPlus: Remove TranslationUnit::getTokenStartPosition()
It was exactly the same as getTokenPosition().

Change-Id: I292522faa18933ec400b556c384786eb9efdfb3a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-13 07:16:29 +00:00
Cristian Adam
c914e5f9c2 Wininterrupt: Add explicit stdlib.h include statement
strtoul is found in stdlib.h and with the llvm-mingw toolchain it
fails to compile due to the stdlib.h header not being indirectly
included.

Change-Id: I85fc5e5828c859572ff1ce2c050556bc087de277
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-11 10:35:50 +00:00
Alessandro Portale
e85e6c4701 Vcpkg: Use vcpkg logo icon for search vcpkg package dialog
Task-number: QTCREATORBUG-29333
Change-Id: I0dca734bdb7a328d97744c21d87de23d273a96b7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-10 12:46:53 +00:00
Alessandro Portale
e02e122991 Vcpkg: Generate CMakeLists.txt code
Provide the contents of the "usage" file for copy & pasting into
CMakeLists.txt. If the "usage" file is not available, provide the same
heuristic code that vcpkg generates.

Task-number: QTCREATORBUG-29333
Change-Id: I3daba7616451a43f93fd8f2e0353542ec5a2c48b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-06 17:46:29 +00:00
Christian Stenger
52bc1578e5 QmlPuppet: Fix build
Change-Id: Ieb459d5dbab7ceba3965a1657b2411cbacac258a
Reviewed-by: hjk <hjk@qt.io>
2023-07-05 06:25:17 +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
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
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
Marcus Tillmanns
6b8473a2e8 Terminal: Fix exit reporting in error cases
Previously the finished signal was sent not sent soon enough
for the Process to recognizes it correctly.

Also, the process stub would exit prematurely in cases of crashes.

The process stub should only return an error exit code if it did not
show the "waiting for keypress" message.

Fixes: QTCREATORBUG-29350
Change-Id: I86f7d75bacbdb5ee2b0009669926d94b6a75346a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-06-30 11:14:49 +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
Eike Ziller
dff9e1463b Reduce usage of app_version header
Most information is available via Q(Core|Gui)Application.
Add an AppInfo structure for the things that are not.

This avoids that the information ends up duplicated and
hardcoded in the plugins, which is not needed or desired.

Change-Id: I4d565e75c42a7b8facafa90c27096ea49359215d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-26 06:57:46 +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
Miikka Heikkinen
f68fe887f0 QmlDesigner: Align camera buttons work on any camera on scene
It's no longer necessary to select camera to be able to align it.
Targeted camera is selected according to this priority list:
- Selected camera
- Previously selected camera
- Camera explicitly set as the camera for View3D of the scene
- Any camera

Fixes: QDS-10045
Change-Id: I3eedc92b7523e77ed5bc52f116ef83b4fe599b35
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-22 08:21:11 +00:00
Christian Kandeler
5203704e24 qbs build: Mark some more tools as non-Qt
Plus small clean-ups.

Change-Id: I3601543b04bfc7b016769a63091a91f62607f2dc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-19 11:26:56 +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
Miikka Heikkinen
5de0bd268f QmlDesigner: Delete puppet rhi pipeline cache every now and then
Unused pipelines are never removed from the cache, so if we don't
delete it ourselves, the cache file will keep growing indefinitely.

We now keep count of how many times we have stored the cache and
remove it after set number of times to avoid bloat.

Fixes: QDS-10075
Change-Id: I5a4d25a7e40c8ff761c6c523cb80cda3f721528f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-12 07:16:51 +00: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
Alessandro Portale
fb724ec38b Terminal: New keyboard lock icon
Change-Id: Ie3964d599fb15def190c51dd33351fa0224cacfc
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-08 14:15:20 +00:00
Marcus Tillmanns
2039880e75 ProcessStub: Don't block main thread while waiting for keypress
Otherwise the request to exit from Qt Creator would be missed,
making QtC hang on exit while waiting for the stub to exit.

Fixes: QTCREATORBUG-15749
Change-Id: I26dfa2c8aa358c8d7ad662ef806f459d1bbb6ec2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-08 12:37:42 +00:00
hjk
19a6428f54 More deprecation induced busywork
QString::count() will vanish.

Change-Id: I65672fa648c0969930e9398ec4e541a0771c8a57
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-08 07:00:01 +00:00
hjk
097ed66cc5 Qml2Puppet: Replace a few deprecated QVariant::type() calls
... by typeId().

Change-Id: Ib617db774cec2c23ac58bcd39d99a59f9820f443
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-07 15:30:53 +00:00
Marco Bubke
278d69df4f QmlDesigner: Fix deprecated function calls
count() -> size()
userType() -> typeId()
type() -> typeId()

Fixes: QTCREATORBUG-29237
Change-Id: Ic63b79f6fab1f6ed5227d97aa12dcbfdebb4f05f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-07 11:31:25 +00:00
Jarek Kobus
abb85b073a QScopeGuard: Make all usages of QScopeGuard consistent
Change-Id: Icfc35ecbdbdee8dadbb1b17789694093427c3ed9
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-07 10:35:01 +00:00
Miikka Heikkinen
5d8bbe6f5d QmlDesigner: Cache graphics pipeline in puppet
Caching the graphics pipeline to disk improves puppet reset speed
somewhat when there are complicated 3d scenes.

Task-number: QTBUG-103802
Change-Id: I49b4f1031ab79bb5f660578e3d82806675f468dc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-07 10:19:35 +00:00
Tim Jenssen
a6d1b594a4 Merge remote-tracking branch 'origin/11.0' into qds/dev
Change-Id: I79a272471b3400eec0a0fa9fca175d1d4a8c0a13
2023-06-07 12:07:21 +02:00
hjk
adcf52e0c4 Fix some more *::count() deprecation warnings
Change-Id: Ib7d1552a6f7b167e15beb7ca1ef26c7d57e090e9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-07 07:29:34 +00:00
hjk
9db19c653c All: Replace deprecated QLibraryInfo::location
... by QLibraryInfo::path() which exists since 6.0

Change-Id: I0e1e071e0d279ddaf1f1027a0e6ce350ab21739a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 14:35:55 +00:00
Tim Jenssen
002d84cb15 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
  src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
  tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
  tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp

Change-Id: I257f1908917bcc58805619b53b6866f2f73ca544
2023-06-02 19:26:05 +00:00
Ali Kianian
1dafc64a54 QmlDesigner: Flush the output stream after sending commands
The output stream should be flushed in order to forward containing data
and clear the stream buffer.

Task-number: QDS-9871
Change-Id: Iec9903a8afb98f3b9d03a9b9c4de67b6bfe3d35b
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-05-31 10:21:27 +00:00
Marcus Tillmanns
bdb31d4348 Copilot: Allow user to disable Copilot
Fixes: QTCREATORBUG-29179
Change-Id: I274de1f13f773fb61b376643b61056b6f14dabaf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-26 12:55:57 +00:00
Tim Jenssen
1b6c0ff56c Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
  coin/instructions/build.yaml
  doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
  share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
  src/libs/CMakeLists.txt
  src/libs/advanceddockingsystem/dockmanager.cpp
  src/libs/advanceddockingsystem/workspacedialog.cpp
  src/plugins/coreplugin/manhattanstyle.cpp
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmldesigner/components/formeditor/toolbox.cpp
  src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
  src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
  src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.h
  src/plugins/qmlprojectmanager/qmlproject.cpp
  src/tools/qml2puppet/CMakeLists.txt
  tests/unit/unittest/CMakeLists.txt

Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756
2023-05-22 21:13:40 +02:00
hjk
d740a355bb Utils: Rework CheckableMessageBox
Remove function overloads, thes are hard to read, to use and to extend.
I'd even argue this should be a plain default ctor and a few setters +
exec(), pretty much like Process::start() nowadays.

Move "decider" magic into a structure that can be filled ad-hoc outside
checkablemessagebox.cpp paving the ground for:

...removing  aspect dependency from CheckableMessageBox, Instead, add a
convenience function to BoolAspect.  Arguably, the latter is not needed
and could be done on the user side.

Use pointers instead of mutable references for in-out parameter.
Makes the "specialness" visible on the user side.

Pass ICore::settings() centrally as done elsewhere to reduce line noise
on the user side.

Change-Id: Ibb366353d1ea35401723fd05ce05672617a0a8fd
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-22 06:40:13 +00:00
Marcus Tillmanns
c59f3102a1 CrashHandler: Fix missing update
The change to CheckableMessageBox was missed.

Change-Id: I8b7fe1230bcf483f9e5371b878d862aff422d925
Reviewed-by: hjk <hjk@qt.io>
2023-05-17 08:31:41 +00:00
Jarek Kobus
f84199f8b7 Solutions: Long live Solutions!
Short live Tasking in Solutions!

Add src/libs/solutions/README.md with the motivation and hints.

Move TaskTree and Barrier from Utils into Tasking object lib,
the first solution in Solutions project.

Tasking: Some more work is still required for adapting auto and
manual tests. Currently they use Async task, which stayed in Utils.
For Qt purposed we most probably need to have a clone of
Async task inside the Tasking namespace that is more Qt-like
(no Utils::FutureSynchronizer, no priority field,
global QThreadPool instead of a custom one for Creator).

Change-Id: I5d10a2d68170ffa467d8c299be5995b9aa4f8f77
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-17 06:29:03 +00:00
Marcus Tillmanns
c158921af3 ProjectExplorer: Don't allow remote run in terminal
Currently the process stub does not support starting / debugging
processes on remote devices. To reflect this the "Run In Terminal"
aspect is disabled for remote targets.

Fixes: QTCREATORBUG-29058
Change-Id: I9b3bcd65d4db468c683f2743a49227bfbecaf3d3
Reviewed-by: hjk <hjk@qt.io>
2023-05-15 10:05:54 +00:00
Miikka Heikkinen
392e9cc84c QmlDesigner: Fix compile error
Change-Id: I6694cd0d48eb00d64be93019d4af418e64ad23a4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-12 10:33:17 +00:00