Commit Graph

80509 Commits

Author SHA1 Message Date
hjk
48990c9400 Qmake: Use FileUtils::commonPath instead of the string based version
Change-Id: Ib7dce9ed26b6ca280767e88ada2bcff52c8a5684
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-04 08:04:46 +00:00
hjk
1b43a4a1bd Core: Partially convert basefilewizardfactory.cpp to FilePath
Change-Id: I68abf990c2125e09228598fff151cbae9910ca44
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-04 07:39:22 +00:00
hjk
fffd732edc GLSL: Fix file licenses
Amends a7956df3ca which accidentally dropped the (L)GPL part.

Change-Id: I75ab5013925bac6563a782c5e19676d39accc1e0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-04 07:36:50 +00:00
hjk
38a6ab6cd6 AdvancedDockingSystem: Fix file licenses
Amends a7956df3ca which accidentally dropped the (L)GPL part.

Change-Id: I22e3f5cdb12b15ee777524cac04aa888606026c3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-04 07:31:44 +00:00
hjk
6b2b52937d Debugger: Check for skippable frames early
This avoids unnecessarily opening of files with functions that
are skip.

Change-Id: Ie435949ad4033444ad5814a91109f33e022711d0
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-03 16:13:29 +00:00
Jarek Kobus
2afb31f371 ExtraCompiler: Hide some methods in protected section
Replace setCompileTime() with updateCompileTime().

Change-Id: I0ab2262787fc1a6c374e8e2b524f1cfad05fcbbf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-03 16:03:23 +00:00
Eike Ziller
5344bec59b Add support for plugin paths set by the installer
This is important on macOS, where we cannot install optional plugins
into the app bundle, because that would break code signing.
Instead the install settings in the signed bundle sets a custom plugin
path outside the bundle, and the installer puts optional plugins there.

Task-number: QTCREATORBUG-26705
Change-Id: I8b36752471d16dfc5828e87e20254f39ab985ca2
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-03 15:59:40 +00:00
Eike Ziller
a986227c95 Merge remote-tracking branch 'origin/9.0'
Change-Id: I2ed18e5ad53cf243bcf75969a6acc302d3cb6c18
2023-01-03 16:31:20 +01:00
Artem Sokolovskii
d2f1ac542f modelinglib: Remove foreach usage part 2
Change-Id: Ia898cc019a0534a97d20a3dc48e69c6617773766
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-03 14:45:31 +00:00
hjk
e1ae96647d Debugger: Save a few cycles in watch data
Change-Id: I1fada2767bedb5c9a90bd8f4f2db6b2c881f111e
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-03 14:28:43 +00:00
hjk
b00442e946 Utils: Make FilePath doc sources a bit more unitorm
Change-Id: I1250cc4bdb354827836b2193bcb64af6fd7f596f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-03 14:28:07 +00:00
Eike Ziller
b41abc94bb Fix highlighting of debugger disassembly view
The disassembly view uses a custom MIME type that derives from x-asm,
but that didn't trigger highlighting.

Make the generic highlighter look at the parent MIME types if no
highlighting was found for the MIME type itself.

Generalize this "go breadth-first through the parents" that was already
used for resolving editor factories.

Change-Id: Ia054058a8c06b9d8849384e79ee3b83fbc12279c
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-03 13:57:00 +00:00
Artem Sokolovskii
15fa9e7096 FileFinder: FilePathify
Change-Id: I7a4bcb05f85058ddcaf0c69c01b0587116410d95
Reviewed-by: hjk <hjk@qt.io>
2023-01-03 13:39:49 +00:00
hjk
09df8dfe44 Utils: Add a bit more and fix some FilePath explanation
Change-Id: I3655fee683ec2e9a48cc9141597398c6ea4d6110
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-03 13:09:31 +00:00
Eike Ziller
e38d1f06bd Fix that Utils::sorted could modify input container
Utils::sorted had overloads for "const Container &", "Container &&", and
"const Container &&", but for _templated_ types "Container &&" does
_not_ mean "rvalue reference", it means "rvalue or lvalue reference"
(e.g. "universal" reference).

That means that for non-const lvalue references that "Container &&"
overload was used, which modifies the input container. Which is a fine
optimization for rvalue references, but is wrong for lvalue references.

Add another overload explicitly for "Container &" before the
"Container &&" overload, and add some tests.

Also fix the compiler warning that triggered the investigation:

warning: local variable 'container' will be copied despite being
returned by name [-Wreturn-std-move]
note: call 'std::move' explicitly to avoid copying

Amends 13f40f5471

Change-Id: I14461fde5fc51a8bb679fd72b886e13b18c47e7b
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>
2023-01-03 13:01:36 +00:00
Eike Ziller
5a4092106e Utils: Remove old MIME database implementation
The new one has been in use for long enough now, that we
don't need the old one for regression testing anymore.

Change-Id: I20a4a1dae483b1fee345ea4ec8e31509f6877047
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-03 13:00:33 +00:00
Henning Gruendl
7f748acc3e QmlDesigner: Fix ColorEditor anchor warning
Fix warning caused by the ColorEditor. Detected anchors on an item that
is managed by a layout. This is undefined behavior; use Layout.alignment
instead.

Change-Id: I58a618054e7e269e770aa53585472474a1b77cdd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-03 12:40:06 +00:00
hjk
0a3f66c790 Android: Consolidate AvdManagerCommand use
Change-Id: I8b15f6807a6d0d38f668d56e11f75b34a8c3a722
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-03 11:09:17 +00:00
hjk
b02d1fd0e9 QmlDesigner: Avoid warning for unused parameter
Amends 0887174727.

Change-Id: I978550293533632950072256750571fd258f7dac
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-03 11:09:11 +00:00
Artem Sokolovskii
a5bee6e3ae tests: Remove foreach usage
Task-number: QTCREATORBUG-27464
Change-Id: I0e42da9b04793be959ad050fdecc0c78c98d9fcd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-03 10:53:15 +00:00
Eike Ziller
cead76f378 JSON wizards: Fix "span" with combo boxes
Combo boxes have "suppressName" set, but if they have span set too, we
still need to use addRow instead of addWidget.

Reorder the if conditions. The previous code didn't make much sense,
because it first checked for suppressName, and then for hasSpan, but
inside hasSpan it checked for (!suppressName) again, which could never
be false.

You can see this in action in the File > Qt > JS File wizard.

Change-Id: I976227f80277642823620e41aba605c8570aed44
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-03 10:30:03 +00:00
David Schulz
e79a0ab49b Editor: increase text cursor visibility on indentation depth mark
Reduce the alpha of the marker if a cursor is at the same position as
the marker.

Fixes: QTCREATORBUG-28645
Change-Id: I01b1825fd3f393dcc75cc58d64a31f22e50e2648
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2023-01-03 10:21:02 +00:00
David Schulz
f0dba78f48 Editor: fix crashing on updating snippet selections
The final selection is not tracked in m_selections and needs to be
handled explicitly. Also add an assert preventing unconditionally
accessing an out of bounds element of m_selections.

Fixes: QTCREATORBUG-28631
Change-Id: I1898418b1126bdaffccbdf0e483e2c659d191917
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-03 09:58:07 +00:00
hjk
2e52f4d8ef CppEditor: Work around an endless loop
Change-Id: I9fdcead4e3770e9feec4124a0b1b8e7aa1c53b70
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-03 09:40:08 +00:00
Vikas Pachdha
180c990dff Docs: Minor fix in XD QtBridge docs
Fixes: QDS-8706
Change-Id: Icf6ad34bf64273574daa715da522fe90a201a9b6
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-02 17:34:10 +00:00
Eike Ziller
bd679b61d1 German translation: Fix error message when installing plugin
%1 resolves to "Qt Creator" or "Design Studio", and the message means
that no plugin for that application was found in the extracted zip.

Change-Id: I1f07a3557bdac7dcabf26206aa12fabac0ca272d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-01-02 15:15:34 +00:00
Robert Löhning
a3c1b35475 SquishTests: Update tst_designer_autocomplete
ui_mainwindow.h is being created on first build. While there
seems to be some workaround for qmake-based projects, cmake-based
projects can't be parsed properly before the file was written.

Change-Id: I0e9802f79b60d7d07ed92ca0ae9b93e53249b61f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-02 14:19:41 +00:00
Eike Ziller
ac32a163eb GitHub: Update deployment target and architectures on macOS
We only support macOS 10.14 with Qt Creator 9, and we
do support Apple ARM for a while now.

Change-Id: I4c3ac07b60cfed0d4f3444836748a995d6edfcc6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-01-02 13:44:08 +00:00
Artem Sokolovskii
4947c5c657 qmljs: Fix warnings
Change-Id: I4bac76e9d7286fc762af3b097102b3aa975f7247
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-02 13:34:52 +00:00
hjk
4ea5a7abec Utils: Avoid one case of passing an empty path to isRelativePath()
The distiction relative/absolute path is not broad enough to
cover all situations like e.g. Windows paths with drive letter
but not starting with backslash, and generally also rarely needed
in user code. The situation doesn't get better with "convenience
defaults", like empty path meaning depending on context.

Mid-term I'd like to ramp down uses in user code, moving corner-case
handling to filepath.cpp behind "higher level" FilePath API.

This here is one step towards this goal.

Change-Id: I070112810a1628ced035e90cc7dc679e2248d688
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-02 10:47:38 +00:00
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