Commit Graph

68765 Commits

Author SHA1 Message Date
Jarek Kobus
ebe708c1a3 AbstractProcessStep: Remove processStarted() virtual method
Add concealedParameters / setConcealedParameters instead, to be
used in AndroidBuildApkStep.

Use concealed parameters also on start failure and on done.

By default, concealedParameters() equals processParameters()
(i.e. no sensitive data to hide) unless the implementation decides
to replace some sensitive data (e.g. password) with asterisks.
In this case the reimplementation needs to store separate instance
of ProcessParameters and redirect the pointer of
concealedParameters() into own structure.
This is being done through a call to setConcealedParameters().

Change-Id: I8b1573b007c0f8a10c9592ccaf25e6f088f04691
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-06 22:45:40 +00:00
Tim Jenssen
c9f7d893f4 Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I7f394c76256d1d24fbc2d40937f3f7a63fb854c1
2022-12-06 16:31:58 +00:00
Jarek Kobus
216f3dd243 AdvancedDockingSystem: Add context objects into connections
(cherry picked from commit d701cd5dbe)
Change-Id: I564b9ffe6c7809a6d50a172062c52558f3023fc1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-06 15:58:58 +00:00
Jarek Kobus
8a7b1d7a00 AdvancedDockingSystem: Add const reference into range-for loops
(cherry picked from commit 0a8c1d6e85de2ac4d73145886cf8a593f90de171)
Change-Id: I623e6d315180596c0dcd5bf09982e27428b4674a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-06 15:56:07 +00:00
Jarek Kobus
c7eb6b8ae6 AdvancedDockingSystem: Fix dropWidget()
I believe the original intention was to pass dockWidget
into notifyWidgetOrAreaRelocation(), otherwise the whole
"if (!dockWidget)" condition above would be no-op.

(cherry picked from commit 4080f31d25)
Change-Id: I0b809ec6587489eaf5e4f79c5c16f26bbb8346c2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-06 15:54:28 +00:00
Miikka Heikkinen
fb24f791b8 QmlDesigner: Fix texture source path for newly created textures
Fixes: QDS-8448
Change-Id: Ibaf51444f2dff8d3de95edd4c8afbc7bc2cd2241
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-06 15:49:27 +00:00
Jarek Kobus
7cf6d9c97b CMakeBuildStep: Get rid of m_waiting field
Change-Id: Iea737960f57e93fa1e688ed43eedf1bf44204709
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-12-06 14:24:46 +00:00
Alessandro Portale
6d63430611 Android: FilePath-ify RunnerWorker
Change-Id: If8e8c2ba94047bbb48a2ae5fee68d4c12d952fd6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-12-06 14:24:38 +00:00
Alessandro Portale
fe294fb00d Android: Remove extra margin from AndroidDeployQtStep widgets
Change-Id: I7e91d6b5405c30c4af3a1b19e836b1a19bb5f90b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-12-06 14:24:22 +00:00
Artem Sokolovskii
f93404d405 CodeStyle: Fix loading settings at the start in codestylesettingspage
Fixes: QTCREATORBUG-28450
Change-Id: I578c6cd102e4753d3af562986dad62e10e54d06d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-06 12:44:45 +00:00
Christian Stenger
538b77e376 CompilationDatabasePM: Fix test on Windows
Change-Id: Id771d3fbcb111ef3b8c4177981794c3bd841cedc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-06 12:30:04 +00:00
Marcus Tillmanns
7bb63f5b21 Clangd: Change the Log target to "Ui"
If the error messages of clangd are not shown in the Ui, it is very
difficult / impossible for the user to analyze problems when they
occur.

Change-Id: I81e2fc9aa999332147837adf54dfac49233e6f99
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-12-06 12:20:10 +00:00
Marcus Tillmanns
46eccf229c Docker: Add clangd executable option
Change-Id: I93fbd9a7a6b0189ca31cc05b35df9d1636da29a3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-06 12:19:57 +00:00
Marcus Tillmanns
79c2984222 Docker: Make hostname valid for Urls
Change-Id: I026aee70503699fcada30948195a7ebd4c76aeb0
Reviewed-by: hjk <hjk@qt.io>
2022-12-06 12:02:04 +00:00
Marcus Tillmanns
0f4430ca05 Docker: Don't try to mount empty folder
Change-Id: I90479d21dd29a291e7d391464efaf40d6a50b662
Reviewed-by: hjk <hjk@qt.io>
2022-12-06 11:41:17 +00:00
hjk
7a02b39f26 Utils: Promote CppEditor::StringTable
It's useful on a more general level, and it's only useful as
real singleton.

Change-Id: I1da38a8eb6f9332a36261288d1b088ca6204eb7a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-12-06 11:40:11 +00:00
Jarek Kobus
9d5d350f8f StringAspect: Fix setting readOnly
Change-Id: Ie8060052c04aec23dfb2b68d127c323dc017844e
Reviewed-by: hjk <hjk@qt.io>
2022-12-06 10:53:03 +00:00
hjk
5c7d842975 Utils: Compile fix after SiC change in Qt Core
__/__/libs/utils/filepath.cpp.o -c /data/dev/creator-bisect/src/libs/utils/filepath.cpp
/data/dev/creator-bisect/src/libs/utils/filepath.cpp: In static member function ‘static QString Utils::FilePath::calcRelativePath(const QString&, const QString&)’:
/data/dev/creator-bisect/src/libs/utils/filepath.cpp:1121:26: error: ambiguous overload for ‘operator+=’ (operand types are ‘QString’ and ‘const char [3]’)
 1121 |             relativePath += "..";
      |             ~~~~~~~~~~~~~^~~~~~~
In file included from /data/dev/qt-6/qtbase/include/QtCore/qstring.h:1,
                 from /data/dev/qt-6/qtbase/src/corelib/time/qdatetime.h:8,
                 from /data/dev/qt-6/qtbase/include/QtCore/qdatetime.h:1,
                 from /data/dev/qt-6/qtbase/include/QtCore/QDateTime:1,
                 from /data/dev/creator-bisect/src/libs/utils/filepathinfo.h:6,
                 from /data/dev/creator-bisect/src/libs/utils/filepath.h:8,
                 from /data/dev/creator-bisect/src/libs/utils/filepath.cpp:4:
/data/dev/qt-6/qtbase/src/corelib/text/qstring.h:708:21: note: candidate: ‘QString& QString::operator+=(const QString&)’
  708 |     inline QString &operator+=(const QString &s) { return append(s); }
      |                     ^~~~~~~~
/data/dev/qt-6/qtbase/src/corelib/text/qstring.h:711:14: note: candidate: ‘QString& QString::operator+=(q_no_char8_t::QUtf8StringView)’
  711 |     QString &operator+=(QUtf8StringView s) { return append(s); }
      |              ^~~~~~~~

Change-Id: I7da443cc6070f406252106a26179afb36fa24eee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-12-06 09:43:49 +00:00
Jarek Kobus
b009eff301 TaskProgress: Add setHalfLifeTimePerTask()
Make it possible to specify expected half-life time per task.
Make TaskProgress more fluent (50 Hz).
Use exponential interpolation for TaskProgress.
Set 30 seconds half-life time for UpdateInfoPlugin.

Change-Id: I1b8a147f259caf6a11fbe06afd8cfe6d4606bb02
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-12-06 06:45:12 +00:00
Ulf Hermann
d6484109b7 Add missing Q_OBJECT to PerfRunConfigurationAspect
Without this we cannot identify the aspect when trying to retrieve the
settings. Therefore, we always run without any settings, and in
particular with an empty command line for perf.

Fixes: QTCREATORBUG-28545
Change-Id: Ia419c939d57ff65eca4992faff02c121ca20c83f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-12-05 16:47:05 +00:00
Christian Kandeler
36ebb4bf22 CppEditor: Move "Show Preprocessed Source" action further down
... in the menus.

Fixes: QTCREATORBUG-28537
Change-Id: I51b4a258da8d654521d0e32256a7143960898227
Reviewed-by: hjk <hjk@qt.io>
2022-12-05 15:27:11 +00:00
Marcus Tillmanns
88728a414c ProjectExplorer: Fix builtin header path query
Change-Id: Iad8883cef88ac605f5ef3bc7e9922a02e4da5bd3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-05 07:52:57 +00:00
Jarek Kobus
55284ba124 CMakeBuildStep: Don't use stdError
Emit addOutput() signal directly. This will add a newline after
the message. Use OutputFormat::ErrorMessage instead of
OutputFormat::Stderr.

Change-Id: Id5e95dd00dca5e57b67c583a1b11071bf4101880
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-12-02 16:38:25 +00:00
Thomas Hartmann
a86cb74526 QmlDesigner: QtObject is in QML now
If a type cannot be created we created a QtObject instead.
Since we create Item for items this crash was rare.

Task-number: QDS-8460
Change-Id: Ifd80f6670bec5328ddd122e0f2f2c133c487b3bd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-12-02 16:35:18 +00:00
Jarek Kobus
51b6efb116 AbstractProcessStep: Don't read std channels on done
Since we are connected to process' readyRead signals
and perform readAll inside handlers, there is no need to
do it again inside process' done handler. It's guaranteed
that before process emits done() signal it emits readyRead
signals if new data appeared on any channel.

Remove processReadyReadStdOutput() and processReadyReadStdError()
helpers.

Change-Id: I7e921335e6410a26efd9619cbed8f5e6852d2cf2
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>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-02 16:23:53 +00:00
Cristian Adam
9deef74d9e CMakePM: Allow presets inherits for deeper hierarchies
Fixes: QTCREATORBUG-28498
Change-Id: Idea5cdec6ad6acfba289dd77632770b7dfbf64f2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-12-02 16:23:46 +00:00
Alessandro Portale
5649fc30ca main: Prevent GTK3 platform theme plugin from enforcing a dark palette
Fixes: QTCREATORBUG-28497
Change-Id: Ib49b57aafe044d711940db3ea0e0778206221111
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-12-02 16:05:33 +00:00
Jarek Kobus
dfd079f050 AbstractProcessStep: Merge virtual functions
Merge processSucceeded with processFinished into one virtual
function. Leave default implementation empty, so that
reimplementations don't need to call base impl. Move
processFinished into private section. Pass just one bool success
parameter into processFinished.

Change-Id: Ide3e262de0c0c5583c9fec2426fa460b6b74a49d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-02 15:37:16 +00:00
hjk
d8bd889eee Boot2Qt: Pass remote only path component of remote application
... as argument to appcontroller. The appcontroler is already
"on the device"...

Change-Id: I9d0a16c8161a0594be114374df2c3603206db837
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-12-02 14:33:38 +00:00
Jarek Kobus
1755f208fb InfoBar: Ensure we don't access nullptr
Change-Id: I4bd7019ea424c04cc1f1e130d76033175ac3a5bf
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>
2022-12-02 14:12:57 +00:00
Jarek Kobus
c37ee615a6 ICore: Fix possible crash in raiseWindow()
Don't call else branch with nullptr when window is nullptr.

Amends 79be19a8a0

Change-Id: I4c1ee3783d36374cbc6ad9555328b5737f2ce348
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-02 14:00:07 +00:00
Samuel Ghinet
728605b2ae Refactor: Extract the code for adding a texture
Task-number: QDS-8344
Change-Id: I433e2beb3ffd6346ea37e093705943b0701efd3d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-12-02 12:34:57 +00:00
Knud Dollereder
16ec1ab67f QmlDesigner: Fix zoom speed for windows
Fixes: QDS-7835
Change-Id: I4ba76f9b7bf7be2472a073515891d50dbe7213c8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-02 11:48:46 +00:00
hjk
b88611f663 Core: Fix capitalization of external tools dir
Amends 451d02c88d.

Change-Id: I7e00c1f6262510f71d83a2f668b3b0353df6fce2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-02 11:26:21 +00:00
Jarek Kobus
10a306b3f4 DocumentModel: Fix possible use of deallocated memory
Setting entry to nullptr inside DocumentModelPrivate::addEntry()
sets it only locally inside this function, so the caller of
addEntry will still hold the originally passed pointer. So, if the
"if (previousEntry)" condition was hold, the caller of addEntry
operates on deleted pointer.

In order to fix it we return the valid pointer instead.

Change-Id: I3e4a5c3532ca942c43ab422a238f0a19ebd41794
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-02 11:11:53 +00:00
Samuel Ghinet
e774aa238b Add "Add Texture" and "Add Light Probe" actions to Assets Library
When the user right-clicks on an image asset, "Add Light probe" now
appears in the context menu. When the user right-clicks one or more
image assets, "Add texture" or "Add textures" becomes available.

Task-number: QDS-8344
Change-Id: Ia8d8379be2a0a285b33e4a230e08527c18756b47
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-02 10:45:41 +00:00
hjk
03525e7d3c Boot2Qt: Feed remote-qualified executable into ExecutableAspect
Change-Id: I8a6d21147ef0df7a1e56fc2c125f687f05fef923
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-02 10:15:46 +00:00
Aleksei German
36c96a0972 QmlDesigner: Use Model ConnectionMetaInfo method
Change-Id: I1ac34ed36df45e8fe1f8baa60311b1c337c4ac71
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>
2022-12-02 09:38:35 +00:00
Miikka Heikkinen
57448021b8 QmlDesigner: Fix content library visibility logic
Also fix enable logic of context menus in content library.

Fixes: QDS-8446
Change-Id: I82f80779f507aa5336ebafac5cffc36365238fc5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-02 08:19:56 +00:00
Christian Stenger
b43f9fd002 McuSupport: Fix tests
Change-Id: I17f4194f2e5be319e73834aa0f10e99821874c9a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-12-02 08:01:22 +00:00
Cristian Adam
e0a563b236 CMakePM: Migrate build environment settings also to configure step
This allows a project to be properly configured with Qt Creator 9 when
the build environment had user defined changes.

Qt Creator version prior to 9 had one setting for both configure and
build steps.

Fixes: QTCREATORBUG-28372
Change-Id: I0da8065085bd6628ba75923c17b46648eb031801
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-12-01 23:52:10 +00:00
Aleksei German
44cfc4a8cd QmlDesigner: Add nullptr checks in ActionEditor
Encountered an odd nullptr in QmlJS::Value *value.

Change-Id: I9140ee15f01a430477b808aa7b664f5c40889c30
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-01 20:30:56 +00:00
Henning Gruendl
d9054d1f10 QmlDesigner: Add qt insight infrastructure
* Add InsightSection for property editor
* Add functions in property editor qml backend, context object and view
* Add InsightTracker in text to model merger
* Add auxiliary data properties

Task-number: QDS-7489
Task-number: QDS-7833
Task-number: QDS-8073
Change-Id: I3fbec3d387f815d71640b512e67829076b600d11
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-01 16:50:44 +00:00
Alessandro Portale
6c676636ba WebAssembly: Cleanup FilePath-related includes
Change-Id: If8308b0396ccb0e837fbbb7fcf15f49f7febcc55
Reviewed-by: hjk <hjk@qt.io>
2022-12-01 16:44:45 +00:00
Thomas Hartmann
740a65571f StudioWelcome: Use QQuickWindow on macOS
This fixes flickering on macOS introduced by Qt 6.4.
Unfortuntly keyboard focus does not work on Windows in this case
if the splashscreen flag is set.
Therefore we only use QQuickWindow on macOS.
Simplfiying code and removing unused code.
The variable doNotShowAgain is always true now.
The check in delayedInitialize can be removed,
since we already show a warning during creation.

Task-number: QDS-8113
Change-Id: I8185a58175f4d2eafe92561fbded535d7ae393a2
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-01 16:15:18 +00:00
Thomas Hartmann
9e9cfeeeac StudioWelcome: Fix warning
Change-Id: Id6a218998f2b0a767d4bd23c8936f5863c00d7b1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-12-01 16:05:47 +00:00
Thomas Hartmann
17c09c1e92 QmlDesigner: Fix warnings
Change-Id: Ia88bbe9bc05fcd1725833d1627499dac3a32c11d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-01 14:47:42 +00:00
Marcus Tillmanns
ad90dd958a WebAssembly: Remove file access from device
Change-Id: Ia2bfa4a7eb4507250ae355d78d6ebdd5e2a54e4e
Reviewed-by: hjk <hjk@qt.io>
2022-12-01 13:31:07 +00:00
hjk
e4c49b720e Utils: Consolidate the isRelative/isAbsolute implementations
Even if we do it wrong in corner cases, we should do it consistently.

Change-Id: I68d5a6e55ede889cb44bedb46d0ea545dae7ba2c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-01 12:51:22 +00:00
Christian Kandeler
a09e87b3d3 CPlusPlus: Do not try to qualify the names of template parameters
These always appear as written.

Task-number: QTCREATORBUG-28186
Change-Id: Iea8cc99ee6c17c1320817977fdb96ae1f730bc45
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-12-01 12:18:42 +00:00