Commit Graph

72385 Commits

Author SHA1 Message Date
Jarek Kobus
910c71b59b Use QtcProcess in IosSimulator
Change-Id: I7e31a2702512802e7670e79ff096e4cc191d42a3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-04 14:20:43 +00:00
Cristian Adam
05b40bbcd3 auto-setup.cmake: Add QT_CREATOR_CONAN_BUILD_POLICY cache variable
By having QT_CREATOR_CONAN_BUILD_POLICY as a cache variable the users
can change the default value of "missing" to something else like
for example "never".

Change-Id: I8b447c40d1331976d0ee35ecb34b4d68c5742771
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-04 14:03:25 +00:00
Christian Kandeler
7e99926efd CppEditor: Make sure all clangd-related widgets are enabled/disabled
... when the general clangd checkbox is toggled.

Change-Id: Icb2503e5e2d66cba4fb81a3dc7a891e8ed694132
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-04 13:26:32 +00:00
Christian Kandeler
a6a1423421 ClangCodeModel: Fix assertion in clangd timing logger
Change-Id: If5134e5160b8278b2d0ef7037a00abe3b4b035ad
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-04 13:24:47 +00:00
Eike Ziller
e6d31c2b37 Merge remote-tracking branch 'origin/6.0'
Change-Id: I560583b200db8f180574256d6d851a867be11c37
2021-11-04 13:52:30 +01:00
Jarek Kobus
acfe224281 Flush finished() signal when waitForReadyRead() was called
Apparently the QProcess behaves like that.

Change-Id: Idb1993b8abccbd7943582d41bd456eacc9a1c185
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-04 12:30:03 +00:00
David Schulz
4d55fc911d clangd: disable lsp snippets
We have some additional handling with the completion items that might
interfere with the snippets.

Change-Id: I86405ec67af189d01c8a4dfa468f56035e6e69c4
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-04 12:07:18 +00:00
Oliver Wolff
08b6e0239f Add support for MSVC2022 (Preview)
2022 should be binary compatibility with previous versions (see
https://docs.microsoft.com/en-us/cpp/porting/binary-compat-2015-2017?view=msvc-160).

Change-Id: I4200f0c7d78adb0d1f352cd527c0f6041a1f5283
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-04 12:02:36 +00:00
Samuel Ghinet
b7d0902257 Add new theme colors necessary for New Project Dialog on QDS
We need colors for the dialog box background, and for warning text messages.

Note: We currently don't have carefully picked colors for warning, so I used
standard yellow (ffff00). The values, for each theme, will need to be adjusted
later on.

Task-number: QDS-4490
Change-Id: I257522216b03610d9f12951e7cb6f7cfa182489f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-04 11:18:40 +00:00
Christian Stenger
662d9a9564 QmlDesigner: Fix compile with Qt5
Change-Id: I366290900fa7198648ca1c6163a35140e0f0a3a9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-04 10:23:08 +00:00
Christian Kandeler
4022043792 ClangCodeModel: Ignore redundant semantic tokens
This can now happen due to the newly implemented refresh support.

Change-Id: If64feede84b044140f7ec04e317289d3f493aa53
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-04 09:54:02 +00:00
Jarek Kobus
8e8e8ddead Use QtcProcess in runQtChooser()
Change-Id: Ied2c58eb522e9ae9e5f312dce98b66bc852f41a7
Reviewed-by: hjk <hjk@qt.io>
2021-11-04 09:44:43 +00:00
Samuel Ghinet
98e5639f78 Make use of font icons for the wizards
Qt Design Studio will be using font icons to display project types (wizards) in
the New Project dialog box, rather than .png icons. The unicode values will be
saved in the wizard.json files as "fontIconCode". We need a way to access that
value in code.

Task-number: QDS-4490
Change-Id: I5dbcc522a707c288ee1f05ab6ec1cb24bcd75025
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-04 09:25:19 +00:00
Christian Kandeler
33b5fa25a8 ClangCodeModel: Do not mark the LHS of assignments as output parameters
... when using clangd. Amends a1f088376a.

Change-Id: Ief442d978e1cf3027dcba5a3c75b66c0f4ae8809
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-04 09:20:30 +00:00
David Schulz
416cd69a5e Editor: unselect text on mouse release event
Update the main cursor after calling QPlainTextEdit::mouseReleaseEvent.
Calling that function might change the selection without changing the
position, so it wont emit cursor position changed, and the multi cursor
does not get updated properly.

Task-number: QTCREATORBUG-26493
Change-Id: Ie310ee9a4c66897766af87065ee42fcd01302854
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-04 09:10:05 +00:00
Miikka Heikkinen
1c526c827d QmlDesigner: Improve error message on trying to edit empty component
Task-number: QDS-5308
Change-Id: I401a375443e2df52a2656a34ab4c650664b0df97
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-04 08:26:24 +00:00
Jarek Kobus
fa1515185a Use QtcProcess in webassembly
Change-Id: I19da9f4d9b2892256bf19655858ef585aa4825a8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-03 20:40:26 +00:00
Henning Gruendl
0484d574d6 QmlDesigner: Add QtMultimedia
Add property editor sheets and item library entries for QtMultimedia.

Task-number: QDS-5147
Change-Id: Ic4fc2926e7bf5aa5376f3fd7b6b5e452034e4001
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-03 18:56:10 +00:00
Henning Gruendl
14c4f257fe QmlDesigner: Allow inserting SVG snippets
Allows to paste SVG clipboard content into the Form Editor. It will
create a Group item which acts as the SVGs view box and groups multiple
items together. All SVG items will be transformed into SvgPathItem.

* Supports all basic SVG shapes path, rect, polygon, circle, ellipse
* Supports the following SVG presentation attributes as CSS-inline
  definition, XML-attribute, style element: fill, stroke, stroke-width,
  opacity, fill-opacity, stroke-opacity
* Supports all transform operations

Task-number: QDS-5259
Change-Id: I9b7027992de60e5c87f2031251348dbb31fe03fe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-03 18:55:47 +00:00
Jarek Kobus
cd6d2b0cd8 Use QtcProcess in QbsSession
Change-Id: I1220bb533e4d7aa0577860b750a7d97e2139bc20
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-03 16:39:35 +00:00
Jarek Kobus
7208ada5b3 Use QtcProcess in QbsSettings
Change-Id: I2d58e039ab84d1a3fe1a04b708209c893384cca0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-03 16:39:29 +00:00
Jarek Kobus
595cfdb3ac Use QtcProcess in QbsProfileManager
Change-Id: I75802dae680b1ef36662ebe6281076919430cebc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-03 16:39:22 +00:00
Ivan Komissarov
dbd5a4fe1b Update Qbs submodule to the top of 1.21 branch
Change-Id: I3620f8d950c24e664df0cef424e65ba195b3336d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-03 15:41:55 +00:00
Jarek Kobus
c8a25e0e57 Use QtcProcess in McuPackageExecutableVersionDetector
Change-Id: I22577835ff3de1cbd787bab7ecaae9cffb8f0c9b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christiaan Janssen <christiaan.janssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-03 15:27:55 +00:00
Eike Ziller
a759a4e8da Plugin wizard: Make github workflow work with Qt 5 and 6
The new default build of Qt Creator is Qt 6 based, so we need to make
sure that that actually works.

Change-Id: I6195f9d46cd020175daf8bc4caaa003fa7ae2b52
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-11-03 14:56:38 +00:00
Alessandro Portale
0de09fe3a3 Android: Enable manual adding of NDKs v22+
Don't enforce the presence of a "platforms" subdirectory if the NDK is
of version 22 or higher. The last NDK version with that directory is 21.

Change-Id: Ib431e7db4521533206304d252dcf93b7ea6169e5
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-11-03 14:33:02 +00:00
Jarek Kobus
b6228eb182 Fix signal slot connection
QtcProcess isn't derived from QProcess anymore.

Change-Id: I6c92163cc0bb73dc8e350ffa05ecbb5a25a88f9a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-11-03 13:46:20 +00:00
Orgad Shaneh
f4701d2bd4 EditorManager: Remove outdated TODO
Change-Id: I8c4632985ba9ec9bc2a4efa3754d50035e6b29d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-03 13:29:30 +00:00
Jarek Kobus
e6969cfa05 MergeTool: use multiarg arg()
Change-Id: If3859509dae9f44ab54ad50491a42f09e5e3a94b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-11-03 13:26:53 +00:00
Eike Ziller
c2e27bd927 Merge remote-tracking branch 'origin/5.0' into 6.0
Change-Id: I436d15f2aeefbf6fc80340f01398509c213fc1b1
2021-11-03 14:26:47 +01:00
Jarek Kobus
50586c7bb8 Use QtcProcess in MergeTool
Change-Id: I9d08c455404a75a29874883dbdc4855a183a58e3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-11-03 13:26:42 +00:00
Eike Ziller
ad8a04f410 Add changes file for 5.0.3
Change-Id: I3fb115586f2207840da2f884c6451101190078e7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
v5.0.3
2021-11-03 10:33:37 +00:00
Christian Kandeler
7e614b599e CppEditor: Transform deprecated -gcc-toolchain option
See https://reviews.llvm.org/D108494.

Change-Id: I85b2a0ea077d2a622fac16bda009a7ee71da0e90
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-03 10:18:45 +00:00
Jarek Kobus
c13d828c99 Remove unneeded includes of QProcess
Change-Id: I017e020c8b2a53d6f4a2422a0a0856044e768247
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2021-11-03 08:13:18 +00:00
David Schulz
426fde79d6 LanguageClient: support semanticTokens/refresh
Fixes: QTCREATORBUG-26499
Change-Id: Icd5879609bb856797fa223394357a1f15554d2cf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-03 07:46:50 +00:00
hjk
d3345320c7 QmlDesigner: Squash warning
src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp:497:51: warning: ‘QDir& QDir::operator=(const QString&)’ is deprecated: Use QDir::setPath() instead [-Wdeprecated-declarations]
  497 |         m_filePathDir = {newDir.absoluteFilePath()};
      |                                                   ^
In file included from /data/dev/qt-5/qtbase/include/QtCore/qdir.h:1,
                 from /data/dev/qt-5/qtbase/include/QtCore/QDir:1,
                 from src/plugins/qmldesigner/designercore/include/subcomponentmanager.h:39,
                 from src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp:26:
/data/dev/qt-5/qtbase/src/corelib/io/qdir.h:110:11: note: declared here
  110 |     QDir &operator=(const QString &path);
      |           ^~~~~~~~

Change-Id: I307e5243a3334257ea4285b23ef0e0453e1e17e8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-03 07:22:46 +00:00
Miikka Heikkinen
1d1b18ae1d QmlDesigner: Copy main document model metainfo to inFileComponentModel
This is necessary to have all component library items available when
editing in-document subcomponents.

Fixes: QDS-5352
Change-Id: Ib7553d8e36a5b9ece7afb3c01681148f6268e7f2
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-02 15:43:50 +00:00
Miikka Heikkinen
5ef4e2f5ac QmlDesigner: Add default template to Component item in library
The default template includes an "Item" child node under the component.
Also added "Component 3D" item that will have a "Node" child.

Task-number: QDS-5308
Change-Id: I254f18a2ec7b623d8cd4a72e6e727d0d17a1a91d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-02 15:43:20 +00:00
Leena Miettinen
5f191126c1 Doc: Describe "Auto-save files after refactoring" option
Task-number: QTCREATORBUG-26278
Change-Id: I7c9a1ead665ab3506f7cb7a8eb13fb14c5863c8d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-02 14:42:33 +00:00
Kai Köhne
75b6266694 Document third-party components by their upstream name
Also use a paragraph from the upstream documentation for
third-party code that missed it so far.

Change-Id: I2609d32eafca9810116f7a9ac2df9221541acb15
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-11-02 13:22:51 +00:00
David Schulz
b272d441cb Utils: disable multi cursor add keyboard shortcuts on macOS
They work inconsistently and interfere with system shortcuts

Change-Id: Ibd85483904144ca697bb372746c7999299b7b1f8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-02 12:41:39 +00:00
Leena Miettinen
f48c7f4df6 Doc: Update Qt Widget based application tutorial
- Describe new wizard dialogs
- Update screenshots

Task-number: QTCREATORBUG-26278
Change-Id: I66407a2f799e05aa1d01e9c9d1ddd509ab07cadb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-11-02 11:54:50 +00:00
Leena Miettinen
d177dab95d Doc: Describe exporting and importing color schemes
...in Tools > Options > Text Editor > Fonts & Color.

Also describe the new formatting options for code elements.

Task-number: QTCREATORBUG-26278
Change-Id: I41540658ec13e7fdcbba9492840c99316fbe1251
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-02 11:51:18 +00:00
Leena Miettinen
8f98f61ed4 Doc: Update info on developing for Android devices
Task-number: QTCREATORBUG-26312
Change-Id: Ic95a7c6ea4b0ab092a1b1feb07bba3dd368a3584
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-11-02 10:41:58 +00:00
Artem Sokolovskii
4d4abc8578 ProjectExplorer: Fix build
Change-Id: I75b2b2860d3b8050bf84205d5d8fff8f0737db81
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-02 09:33:41 +00:00
David Schulz
4ecb6a9dc0 Utils: Allow combining add multi cursor events with shift
The old block selection shortcuts were used with alt + shift + up/down,
but the new multi text cursor were just expecting alt + direction key
for adding new cursors. In order to not break with habbits also ignore
shift modifier when checking for alt + cursor move key events.

Fixes: QTCREATORBUG-26503
Change-Id: I064e666a04b88c3b90d10ea35688613159f7d4a5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-02 08:31:14 +00:00
Eike Ziller
195abefe7d EditorManager: Remove QString openEditor(At) overloads
In favor of the FilePath/Link ones.

Change-Id: I5caf9e0f8de304ff4ee12329557aa50a6f3a0c69
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-02 08:11:14 +00:00
Christian Stenger
a8d5929be3 Utils: Do not update pathchooser value from displayed string
The displayed string may differ from its "real" resulting path
depending on having a base directory or not.

Fixes: QTCREATORBUG-26408
Change-Id: Ic569671899329249559a2bfb3ecd30190f166dba
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-02 08:09:15 +00:00
Jarek Kobus
6e8dcbcfd2 Fix a crash when modifying pro file
In some unlikely case it may happen that between finished() signal
is emitted by a watcher and when the queued handler is being called,
someone could have called CppProjectUpdater::cancel() and delete
the watcher immediately. In this case the handler could operate
on deleted watcher instance.

Add a QPointer in order to guard the watcher inside the queued
handler.

Amends: e3b639047f

Fixes: QTCREATORBUG-26507
Change-Id: Idb4a953e9017ce672adc64becb3061bd80c8c378
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
qds/v2.2.2
2021-11-01 15:19:15 +00:00
Christian Kandeler
f08d0e3d3e ClangCodeModel: Prevent restarting the same clangd client more than once
Change-Id: Ifd81a26506e48817b97c8ed1e5fa16ebb31d8c69
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-01 14:20:02 +00:00