Commit Graph

80529 Commits

Author SHA1 Message Date
Eike Ziller
371dcc3f26 Merge remote-tracking branch 'origin/9.0'
Change-Id: I58ff80e0be838ef5f149c091b8f74cda415ed53f
2023-01-02 11:19:06 +01:00
Eike Ziller
b8e195d22b qmlpuppet: Fix build with Qt 5
The API uses QVector, which is a QList in Qt 6, which is why assigning a
QVector to a QList works "fine" there. But with Qt 5 we must use the
correct type.

Also assign to a const variable. Otherwise this actually forces a
detach.

Amends 9321c6ad24

Change-Id: Ied562b96d647435ae48395ae08cc12a5670ac607
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-02 10:02:44 +00:00
Leena Miettinen
5c34e9922e Doc: Describe "rr" and "sr" locator filters
Change-Id: Id16d7da1dd5f6b53173625deb2dbe9bf1151e651
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-02 10:01:05 +00:00
Mats Honkamaa
9a335c9f67 Doc: Fix typo
Task-number: QDS-8197
Change-Id: Iaf6ad34bf64273574daa715da522fe90a2010976
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-12-27 11:54:43 +00:00
Mats Honkamaa
c342d3f321 Doc: Remove confusing word
Task-number: QDS-8248
Change-Id: I0f3fe1c6f3437b6fe1c29df4606aa2f8abb7c24b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-12-27 08:56:51 +00:00
Alexey Edelev
803fb4ce77 Replace ANDROID_NATIVE_API_LEVEL with ANDROID_PLATFORM
ANDROID_NATIVE_API_LEVEL is not handled by the android toolchain files
starting the NDK version r23b. We should set ANDROID_PLATFORM instead,
to specify the NDK platform version, that exists in all NDK versions
supported by Qt. Also the ANDROID_PLATFORM variable expects the
'android-xx' format as a value, so avoid cutting the 'android-' prefix
when adding the value to the CMake configure string.

Fixes: QTCREATORBUG-28624
Change-Id: Idd4ba472e46982162e5ad74e9fc6868e50e3b434
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-12-23 17:10:13 +00:00
Eike Ziller
3c281e315b Merge remote-tracking branch 'origin/9.0'
Change-Id: Ia890e7c2eda6ba952bc5d32cc81ca8e216dc11c5
2022-12-23 14:29:32 +01:00
Eike Ziller
01a4f47781 Build: Disable cpack for commercial sources
There isn't a single license that could be used, so to support this, it
would need to be chosen somehow. Just disable for now, because otherwise
CMake configuration breaks.

Fixes: QTCREATORBUG-28603
Change-Id: I26a01d6ab317ffeb212d6e5517100eaf07963377
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-12-23 08:59:13 +00:00
Eike Ziller
cd496c4fa7 CMake build: Add missing headers to be exported
These headers are used by other exported headers, so they need to
be part of the development package for building "external" plugins.

Change-Id: I6bec0b16aaf0076b8ccf4ce275b603e0f7b4eba3
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>
2022-12-22 15:35:15 +00:00
Artem Sokolovskii
1b1609ce27 modelinglib: Remove foreach usage part 1
Change-Id: Ib185d0dbe7df2e5452502278d9a2c3151cf9812e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-12-22 14:24:43 +00:00
Tim Jenssen
f2956ece11 Merge remote-tracking branch 'origin/qds/dev'
Conflicts: src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
  src/plugins/updateinfo/updateinfoplugin.cpp
  src/tools/qml2puppet/CMakeLists.txt
  src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp

Change-Id: I6b65ce2d603453fcebc2291574d55db80853f247
2022-12-22 14:08:46 +01:00
Leena Miettinen
0e063ecfca Doc: Add second level to online sidebar TOC
Change-Id: I55e36278ff907e6625f49b4987e2786b8e5f7f97
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-22 10:14:17 +00:00
hjk
be89f99ecc CPlusPlus: Work around Qt SiC breakage
Qt Base b6cbd9c43afc7e005c1f78e1d0f700524930ed71 introduced

    #if !defined(QT_STRICT_QLIST_ITERATORS) && (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) && !defined(Q_OS_WIN)
    #define QT_STRICT_QLIST_ITERATORS
    #endif

removing iterator-to-pointer conversion starting with Qt 6.6 as dev,
i.e. now.

Change-Id: I75f25623917d0e666fb267db70d9701a13b270f2
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-22 07:50:49 +00:00
hjk
2aff1282c4 Debugger: Leave everything in qobject.cpp when skipping known frames
This avoids stepping into a large chunk of not-so-interesting parts
in atomics etc by hopefully not skipping too much.

Change-Id: I29fb2705275899332dfab0f6991670ac9bb2cc57
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-22 07:43:36 +00:00
hjk
ef3aad1c9b Debugger: Save a few temporary string constructions
... when skipping known frames.

Change-Id: Iade1d9cb539eef7708c5715d99147be31be1c724
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-22 07:43:23 +00:00
Tim Jenssen
d5cf9ffd37 qmlpuppet: fix standalone build
Change-Id: I0a7da757e78a68f65163d4e383323d34a5b70670
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-21 18:45:40 +00:00
Artem Sokolovskii
9321c6ad24 qml2puppet: Remove foreach usage
Change-Id: I00af71e640a46962f987f7eb7d360f04d68f23ea
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>
2022-12-21 13:43:46 +00:00
Pranta Dastider
9a7f152b96 QmlDesigner: Update Figma Bridge setup doc
The old figma bridge setup for qt design studio
instructions got outdated. So, this was updated
considering the new version.

Fixes: QDS-8514
Change-Id: I3c88558e0e804039e26d2e5f6f84d3a0df83f231
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-21 13:35:44 +00:00
Sami Shalayel
5d6765c08e changeLicense.py: support new license style
Add support for the new licenses (that are commented out linewise via
//) to changeLicense.py that until know just knew about the old-style
licenses commented as /*block*/.

Change-Id: If29c4a49e210cf7516ae93fb1b7ef7e9f5a51f34
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-12-21 13:18:32 +00:00
Artem Sokolovskii
f0556b08b8 qmljs: Remove foreach usage
Task-number: QTCREATORBUG-27464
Change-Id: Ifdb8cf514dfe328e0a64bde1beff3e63a4b7fbc3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-21 12:53:41 +00:00
Tim Jenssen
f396b0b742 qmlpuppet: add .tag reading for GIT_SHA
Change-Id: I29f0663b9bbc6f68c7f802fa8fef4b12e091ee61
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-21 11:01:00 +00:00
Tim Jenssen
01b71195f0 qmlpuppet: fix include if crashpad is enabled
#include <windows.h> should come after #define NOMINMAX
not sure why it was necessary as an explicit include
it should come by the crashpad includes

Change-Id: I53ccdd893e9d8e5d5fadd46f5a5f5c0c21af0cc5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-21 11:00:55 +00:00
Knud Dollereder
a049dbf8d3 QmlDesigner: Fix Navigation event filter for some Linuxe
Change-Id: I4d629c5ec6866e497949455ef3cd59a216ffdbb6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-21 09:16:31 +00:00
Tim Jenssen
e16af85f32 qmlpuppet: fix Qt5 builds
Change-Id: Ie3fedef867bf2327b145b4ef4e5b282858076b23
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-21 06:44:50 +00:00
Tim Jenssen
74da3abb32 qmlpuppet: fix crashpad build
Change-Id: I02f5abce80d4ccc1ea711e1dcb01946d53f8b5a7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-21 06:44:40 +00:00
Alessandro Portale
50ebf1f824 Utils: Show macroExpander icon only on non-readOnly StringAspects
Change-Id: Ib9c22c8e7b73c166452b4b18341fc81673c55535
Reviewed-by: hjk <hjk@qt.io>
2022-12-20 19:32:51 +00:00
Alessandro Portale
9eb3cb1acc Android: Remove Service management from AndroidManifestEditorWidget
Any manipulation of an AndroidManifest.xml document in the
AndroidManifestEditor would heavily modify present <service/> entries.
Even if the Service widget is not used. Furthermore, the service
handling code would filter out any present white space.

A visual XML editor must keep any present information (ideally also
formatting and white spaces) intact and should only apply the minimal
amount of change when saving. This can be challenging if the loaded
AndroidManifest.xml has before been hand-edited. Implementing and
maintaining a visual XML editor requires much effort. It has to be
considered if such effort is reasonable for a specialist feature like
creating Android services, especially since the "Manifest elements
reference" is very well documented on developer.android.com and the Qt-
specific parts in the Qt docs.

This change removes the service management from the
AndroidManifestEditorWidget. A good, text-based XML editor that
considers the AndroidManifest schema is a valid substitute.

Fixes: QTCREATORBUG-28024
Change-Id: I73ce5b5c548c5bee6fb7fe2d50d83e0ca3937208
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-12-20 19:32:20 +00:00
Artem Sokolovskii
3f340616d5 plugins: Remove foreach usage
Change-Id: Idf60caed3b5f4ec4c6e990a9e3188487bcc824f8
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>
2022-12-20 17:27:01 +00:00
Henning Gruendl
d77cdc88d7 qmlpuppet: fix build
amends last commit

Change-Id: I057912c49526d386707b893227f16410297d7b18
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-20 15:59:57 +00:00
Tim Jenssen
1262c68f2e qmlpuppet: fix standalone build
app_version.h is not generated and found if a build
just for the qml2puppet target is requested

Change-Id: I9ef164d8e0c698d43eae74d2522029f9eff0f397
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-12-20 14:12:24 +00:00
Samuel Ghinet
f9a0b325d7 QmlDesigner: Fix the right margin for the AssetsView
Task-number: QDS-8352
Change-Id: If08cf7c39cea9dde8e241214c775685b4b1fd4f8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-20 14:02:42 +00:00
hjk
2b97f69796 Debugger: Merge GDB and GDB Extended option pages
Change-Id: I0d4c041cec9ea01e1310f08a4ee87ed8080976bd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-20 13:26:09 +00:00
Amr Essam
c4cc576825 QmlDesigner: Create default effects folder in assets library
Task-number: QDS-8166
Change-Id: I12bf86ec5983642295a20d254f06d0a4ab6ccdb1
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-20 13:06:57 +00:00
Cristian Adam
44d2f15108 CMakePM: Update configuration failure message
The error message was not translated. Also expanded the failure message.

Change-Id: I79307d942d047311314f70d629ff443ee0a7b2a5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-20 12:00:22 +00:00
hjk
0bc9d493aa Debugger: Move backend-specific option pages to the end
<generic> <gdb> <cdb> <generic>  was an odd order.

Change-Id: Ic3a998e4753118c26250f9e4c764495c70b870f7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-20 11:58:22 +00:00
Marcus Tillmanns
d63b2ca51f ClangFormat: Parse clang-format file when needed
Previously the .clang-format was parsed even if there is an override
active.

Fixed .clang-format to follow style-guide more closely.

Change-Id: I39c5e5793cfe9e8a996e084e4ba169231a9bcebb
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-12-20 11:39:33 +00:00
Mahmoud Badri
e4af787ff6 QmlDesigner: Add image info to content library texture tooltip
Fixes: QDS-8489
Change-Id: I1afbf91ad12839cc93a46f0a608ab3bda135b76b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-20 11:29:30 +00:00
hjk
f81724f458 Debugger: Make android std dumpers refer to libcpp
Amends af881688e5.

Change-Id: If207dd04e37e5f80f68b374fe66fd3beec330ead
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-12-20 11:19:46 +00:00
The Qt Project
0cd9df5030 Merge "Merge remote-tracking branch 'origin/9.0'" 2022-12-20 10:59:15 +00:00
hjk
33eb5ff391 CMake: Move CMakeInstallStep definition to .cpp
It doesn't have to be a Q_OBJECT. Smaller interface. Also de-noise a bit.

Change-Id: I70c056e76646e9de166ded46f6fd4f448a804112
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-12-20 10:23:23 +00:00
Eike Ziller
3f4c3a3db4 Merge remote-tracking branch 'origin/9.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/texteditor/texteditor.cpp

Change-Id: I9c8f1331be3f5442f1fd28aeb0a9bc07128629d1
2022-12-20 11:05:01 +01:00
Eike Ziller
68e15e613f Remove unneeded .pro/.pri files
Remove qtcreator(_ide_branding).pri, and all remaining .pro/.pri
files that depend on it.
They have CMake files now.

Change-Id: I87d100b49df7ca95694a755cb581cb5eea26aa9a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-20 10:00:05 +00:00
Eike Ziller
77dfa71f06 Deploying Qt: Clean up .cpp.o(bj) files when deploying Qt
These files are required when building against some static libraries
that Qt ships. Since we don't link against these libraries, we used to
remove them when we install Qt, but starting with Qt 6.5 some of these
files are required by the Qt CMake files, and configuration would fail.

So, we now have to remove them when deploying Qt, instead of already
when installing Qt.

Change-Id: Ie38ab3735b86df0372b946d6a808007b5ec84b88
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-20 09:58:28 +00:00
hjk
c83e66d45f Debugger: Update "known functions" to skip
Fixes: QTCREATORBUG-26821
Change-Id: I12e895034bcf3896caef75f38364cbc9a4484ae5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-20 08:51:14 +00:00
hjk
7e1fb3aaaa Utils: Use std::variant for environment changes
Change-Id: Ibdac141c5ef2dc2fa4c163e059f746dfb6f9625d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-20 08:25:57 +00:00
Cristian Adam
68eb983b5d Revert "Utils: Remove some fallback code that uses a full remote env"
This reverts commit 192605f01c.

Reason for revert: breaks tst_utils_deviceshell

Change-Id: Iafae2aa8da09c23746dccd170e10ea07ffb71ed3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-12-20 06:33:43 +00:00
Samuel Ghinet
4a5359cb86 QmlDesigner: Extract asset type stuff from the AssetsLibraryModel
This is in preparation for the task that will show metadata of assets.
The functions for checking the asset type have little to nothing to do
with the model. This change will also clean up the code a bit.

Task-number: QDS-8177
Change-Id: Ibab28f5b63228f626f517a59e2442d2718c2fc07
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-19 16:39:51 +00:00
hjk
e7b4ccf608 QmlProjectManager: Fix starting .qmlproject on Boot2Qt
The "qmlscene" is called "qml" nowadays. Also give device settings
more priority to cover cases where there is no Qt build setup at all.
For this case, also demote the missing Qt build version from "Error"
to "Warning".

Task-number: QTCREATORBUG-28074
Change-Id: Ic44d2bee1965493925d21317d12d5c1f66ace88b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-19 16:23:28 +00:00
Cristian Adam
aa1690ec7b qml2puppet: allow Qt Creator build without QtQuick
Only require the full dependencies for a standalone build of qml2puppet.

Change-Id: I2a158b36fa674db6d655b753afe205f419c0a113
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-12-19 15:41:24 +00:00
Amr Essam
fb12660b0a QmlDesigner: Enable integration of the new create effect system
- Remove old New Effect item from new file dialog
- Add license checker for creating effects

Task-number: QDS-8675
Task-number: QDS-8676
Change-Id: I83ed2c4021c9df3896018da19fbff76be92a7431
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-19 15:06:53 +00:00