Commit Graph

74059 Commits

Author SHA1 Message Date
Christian Stenger
afda00f1fa QmlJS: Update version information
Fixes: QTCREATORBUG-26273
Change-Id: I3a2c7c0d11436655a87d6288412af95ff3ffdaaf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-10-26 04:25:25 +00:00
Leena Miettinen
e95778707b Debugger: Fix UI text
Task-number: QTCREATORBUG-26458
Change-Id: I6625d30e2eb2d2fcca87360f84d50109632071f2
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 15:19:38 +00:00
Leena Miettinen
6739266a8e Docker: Fix UI text
Task-number: QTCREATORBUG-26458
Change-Id: I6dcdbf199259259416e4bfb11c3488f8594b0c0b
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 15:18:14 +00:00
Leena Miettinen
354c6405c3 Android: Fix UI text
Task-number: QTCREATORBUG-26458
Change-Id: Ibc407db46a605c6bde8f994af63f678a5a102b0e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-10-25 15:18:00 +00:00
Leena Miettinen
dcd4d1c92e Launcher: Fix UI text
Task-number: QTCREATORBUG-26458
Change-Id: I99ffa236a58dd9bdad9716edfdd7a576293144d8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-10-25 15:14:33 +00:00
Leena Miettinen
cd80f0a096 Wizards: Fix description of Qt Application template
The applications can also be run on the mobile device platforms
listed in the wizard dialog.

Task-number: QTCREATORBUG-26477
Change-Id: I845d95c5ca46804691613177d7e285246b1593ba
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-10-25 15:00:01 +00:00
Artem Sokolovskii
a013d75728 CppEditor: Change parsing opposite bracket
Fixed behavior:
- when comparing sign was determined as angle bracket
- when in complex combination brackets, an opposite bracket
was detected not correct
- not correct mismatch case highlightning
Added tests for the cases form bug 26395

Fixes: QTCREATORBUG-26400
Fixes: QTCREATORBUG-26395
Change-Id: Ic45566d2677f80fb9a8e4fe830307254dd1db51d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-25 14:07:44 +00:00
David Schulz
5a2b58550e Debugger: use Qt version from kit as fallback for dumper
Fixes: QTCREATORBUG-26456
Change-Id: If2cd664212b3fa07d7abaef7a1173f79716884bb
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 12:06:18 +00:00
Eike Ziller
ec422648ad Examples: Fix image scaling for Qt 6
For Qt 6 we must manually convert images to a larger image space before
rescaling, otherwise we get dithering effects.

Fixes: QTCREATORBUG-26462
Task-number: QTCREATORBUG-24098
Change-Id: I0d7bb70003822d61d6bc4bc571d29ef82c4dbb0e
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-10-25 11:44:05 +00:00
Assam Boudjelthia
f4db436a7b Android: remove Virtual from the AndroidDeviceFactory
Keep it only Android Device since this title is used in many places
around Qt Creator in different contexts it is better to make it
"Android Device" to not give any unintentional hint that only virtual
devices are covered. Such cases are the project creation wizard and the
kit target device settings.

Task-number: QTCREATORBUG-26477
Change-Id: I8c7224243aec6b8f5b5bf95db8d23b9aecbafca6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-25 10:31:18 +00:00
Assam Boudjelthia
43f759a6b0 Android: remove unauthorized field form AndroidDeviceInfo
This is not really needed anymore, it was mainly used for physical
devices to report whether they need user authorization to be used
via adb. This is now handled by IDevice::DeviceState, where a
Connected device is unauthorized, otherwise any physical device is
ReadyToUse if authorization is good.

Change-Id: If5c1e49b98063eabe4205cd8adb5b11515e1e1de
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-25 09:22:08 +00:00
Assam Boudjelthia
ec55b1a483 Android: remove AndroidDeviceType and State from AndroidDeviceInfo
No need to have these enums which are now only a duplication of
IDevice::MachineType and IDevice::DeviceState.

Change-Id: Icc3f112f2670c7354bb282b36fad0f0631b9e047
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 09:21:37 +00:00
Assam Boudjelthia
affe3ccf51 Android: Make refresh action device specific
Change-Id: I18386ad88e04696068f5f127cadb7ffcc6f25a56
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-25 09:21:22 +00:00
Assam Boudjelthia
fbcb45c105 Android: get build dir based on settings file path for qmake projects
Check Constants::AndroidDeploySettingsFile path first, and use
the buildTarget's workingDir only if that former value is empty.

Fixes: QTCREATORBUG-26357
Change-Id: I726a4b5cd60042845988b4428eea03ef0adb9920
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-25 09:20:23 +00:00
David Schulz
12bc192422 Docker: mount python dumpers to device
Change-Id: Ic0d67b4a18247439f5797a0dcf74df945ef6f61e
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 08:56:16 +00:00
Christian Kandeler
6f26a1545c ClangCodeModel: Check doc revision when highlighting with clangd
Change-Id: I981d375e3656e89bb66516218e3f4e33ee8bbb9e
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-25 08:45:07 +00:00
Christian Kandeler
2eb50afd9c LanguageClient: Fix document version update
... for empty semantic tokens delta.
Amends 86061fb44a.

Change-Id: Id6d6cdc1904ea5353d18cea57b55ed3fa16727de
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-25 08:43:11 +00:00
David Schulz
d84de31384 Docker: Map command executables to device path
Change-Id: Ia8edf686a546f57b42ed0141e2986eded6f96ec1
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 07:33:03 +00:00
Leena Miettinen
1b24bd52b0 Doc: Update information about multi-cursor editing
Fixes: QTCREATORBUG-26459
Change-Id: I89ac09094fe707a5d432cfe84c8b3ee18887a424
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-25 06:46:36 +00:00
Jarek Kobus
474ce0399d Ignore the wheel event explicitly in order to propagate it further
Qt 6 brings a behavioral change regarding delivery of wheel events:
92df790f46b3a8b17aec2f385d6472fd3f8647f6 and
2a857ee28315c5bacfe2ecaf402ca9005b35c20e. If there is an event
filter installed and wheel event is being processed, the event
is now accepted by default, which means that after returning
true from eventFilter(), the event is not propagated anymore.
Since we want to redirect the event to the parent HelpViewer object,
we explicitly ignore the event prior to returning true.

This patch fixes the QTextBrowser backend.

Amends 0b96a1b76b

Fixes: QTCREATORBUG-26369
Change-Id: I7a0167c54f830fffab13d73eb91cb2ecbd730c86
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-10-25 05:48:56 +00:00
Christian Kandeler
404cf0f632 CppEditor: Mark generated setter as slot only for QObject-derived class
Fixes: QTCREATORBUG-25789
Change-Id: I79174bcd617eb54540009491031cfae380383c41
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-22 12:34:51 +00:00
Eike Ziller
b2cdfccf54 Make File System view independent from ProjectExplorer
As preparation for moving it to Core so the "Show in File System View"
functionality can spread more.

Change-Id: I0f7d36f1d7eebe7b074c7949dd95b2cd985bfec8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-10-22 11:13:10 +00:00
David Schulz
86061fb44a LanguageClient: save document version for semantic tokens
Change-Id: Icd17e7f140cd172b2515711a3562c479f0ad488d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-22 09:23:27 +00:00
Christian Kandeler
9f7cdd6d3c CompilationDbProjectManager: Fix tree scanning
- We checked for the QFuture's canceled status at a time where it would
  always yield true.
- A pointless default value was used for the project root path.

Fixes: QTCREATORBUG-26356
Change-Id: I4d17c6ecb7e9e7e71df737d85b42feb37d3ead5d
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-22 09:06:09 +00:00
David Schulz
0a7935d449 ProjectExplorer: fix comparing toolchains on redetection
Use the specialized operator== of ToolChain when looking for priorly
defined autodetected tool chains.

Fixes: QTCREATORBUG-25697
Change-Id: I477d29695eef2acb1ba566d42df9b1e57d26eb07
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-22 08:12:52 +00:00
Christian Kandeler
2085e2ad0b CppEditor: Make sure fallback project part is up to date
... with regards to the session include paths.
Amends 0636238429.

Fixes: QTCREATORBUG-26323
(cherry picked from commit 8c86b9bca1)
Change-Id: I972a314db607d0b06859744dec4c83e885be3b5c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-22 08:01:54 +00:00
Tony Leinonen
348c3c98a0 Update missing InputMethodHint values
More values has been added to qnamespace.h that were missing from
this qmltypes file.

Task-number: QTCREATORBUG-22231
Change-Id: I36eb32b70c2bb416ec3770bfe9098e6db7a10930
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-10-22 06:59:22 +00:00
Leena Miettinen
75bdc64d44 Doc: Move images that only appear in QDS Manual
...from doc/qtcreator/images to doc/qtdesignstudio/images

Change-Id: Iaa49fbb4d620a833edd41b97874aad631b7c25b5
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-10-21 14:23:12 +00:00
Kai Köhne
c565846723 Update details about LLVM/Clang in acknowledgments
LLVM moved to github a while ago - the old svn repositories are dead.
Furthermore, (almost) all of the code is now under the "Apache 2.0
with LLVM Exception" main license
(see also https://foundation.llvm.org/docs/relicensing/)

Change-Id: I8319f8479357c6182c5bf78b1ee7fe202e666980
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-21 14:10:59 +00:00
Alessandro Portale
6fd8336b7f Wizards: Remove unused QtQuick.Controls-style preview thumbnails
These were never used. And updated ones are upcoming with the new QDS
application wizards.

Change-Id: I998c3c0b8cfa3033d8be46524db3ed978738e729
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-21 13:16:30 +00:00
David Schulz
bd4393a72c ProjectExplorer: use logging rules for debug output
Change-Id: Ia99286182cf75eedab920695f3186ca00100ae73
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-21 12:27:14 +00:00
Christian Kandeler
c3cee40411 QmakeProjectManager: Do not leak QmakeEvalResults
Fixes: QTCREATORBUG-26326
Change-Id: I2a4abf86e9dd607bf7a0bf0843b0c9bff943d704
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-10-21 12:21:32 +00:00
Christian Kandeler
d7c7089ff3 ClangCodeModel: Restart clangd fallback client
... on fallback project part change.

Change-Id: Icfc355443b4d6bb3c94eae27c2d23bbd9f681211
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-21 09:23:38 +00:00
Eike Ziller
ea1655881d CMake build: Force -fPIC for static libraries on UNIX
Usually that is done by Qt, but not if reduce_relocations is off.

Fixes: QTCREATORBUG-26435
Change-Id: Idd337d59555fd6e732215b9c753820672f63c91f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-10-21 08:33:31 +00:00
The Qt Project
be5268d0a9 Merge "Merge remote-tracking branch 'origin/6.0'" 2021-10-21 08:13:59 +00:00
Johanna Vanhatapio
f40aa23d93 Doc: Update the Scene Environment Topic
Task-number: QDS-4888
Change-Id: I63d17e02054a2a475e43f1e0ac9c5691422cf703
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-10-21 07:55:15 +00:00
Jarek Kobus
0101808407 Refactor HighlightingResultReporter
In some unlikely circumstances it may happen that
HighlightingResultReporter might be destroyed before
returning from the HighlightingResultReporter::start()
function. This may lead to undefined behavior.

Refactor the HighlightingResultReporter so that instead
of using QRunnable subclass we define simple function
returning the QFuture object directly.

Change-Id: Ib833771a7e46e87c83d10b59ca056a0147fabe88
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-21 07:38:53 +00:00
Christian Kandeler
ec633061d4 ClangTools: Fix fix-it application
The logic for applying formatting was completely broken and had
obviously never been tested with a formatter that does anything.

Fixes: QTCREATORBUG-26420
Change-Id: Iffc1784b225969b86b221afb16c06e8e0d053b91
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-21 07:16:32 +00:00
Eike Ziller
bb9774de92 Merge remote-tracking branch 'origin/6.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: If8baed5564470e550a0ba5c7720915217eec2412
2021-10-21 09:13:03 +02:00
Orgad Shaneh
75705e3eab OutputPane: Fix inconsistency between output view buttons and popup menu
Since definition of function OutputPaneToggleButton::flash() sets the
button visibility to true this leads to inconsistency which had been
described in ticket.

Task-number: QTCREATORBUG-19390
Change-Id: I5e88d2b42808cdec24d25e126b1c8de011a1db84
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-21 07:09:10 +00:00
Tim Jenssen
5377253612 qmlpreview: use empty messageReceived()
Default implementation already does not react on it.

Change-Id: Ieaca8ab0a700b9626a705567f228bdc05172c188
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-10-20 21:58:31 +00:00
Cristian Adam
7e62840ec1 CMake: Define BUILD_WITH_PCH before usage
On Windows QtCreatorAPIInternal.cmake would contain a check for
BUILD_WITH_PCH and if not set add a few defines to the DEFAULT_DEFINES.

First time the BUILD_WITH_PCH would not be set, because the option
will be set later, the DEFAULT_DEFINES will contain the specific non-pch
defines.

The second time BUILD_WITH_PCH would be ON and those non-pch
specific DEFAULT_DEFINES will be removed, and the build system has
to do a full rebuild because the defines changed.

Change-Id: I3f039a91667affc35f18103cfed062481f9dc93e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-10-20 19:18:03 +00:00
Marco Bubke
428a9ee509 QmlDesigner: Use one synchronization struct
The arguments of the synchronization function are changing constantly, so
all tests have to adapted even for default arguments. To reduce this
changes now a struct is used as parameter.

Task-number: QDS-5196
Change-Id: Id3b6a530bcb8ab043eccce6526088f345d746235
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-20 16:42:47 +00:00
Marco Bubke
b4fcd05451 QmlDesigner: Introduce different modules for cpp, qml and directories
There are now different modules for qml, cpp and directory imports.
Cpp imports are qml import append by "-cppnative".

Task-number: QDS-5196
Change-Id: I599b224892c5ada0224a765d0bde8b32de20b061
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-20 16:41:55 +00:00
Marco Bubke
cb946ec307 QmlDesigner: Support multiple module ids per type
The type will be use source id and name instead of module id and name as
key.

Task-number: QDS-5236
Task-number: QDS-5238
Change-Id: Ibc9c298dc0a6363b630173ec4981d574cecd02ff
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-20 16:41:34 +00:00
Orgad Shaneh
3871e40f43 Fix qHash-related size compatibility warnings by MSVC
Change-Id: I3b7981ce78b67db4b996f99682284a0b911d8cd7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-20 15:03:51 +00:00
Leena Miettinen
11c73adbe0 Doc: Remove obsolete files
References to these files have been removed, but the files
were forgotten.

Change-Id: I412d5daf2acf07b4f8c00715bc01e4422bbc1179
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-10-20 13:27:16 +00:00
Leena Miettinen
a99bd10860 Doc: Fix links to QDS tutorial images
Change-Id: I31315c9512e9fbad5f7462e5e82ba72666bb5719
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-10-20 13:14:13 +00:00
Christian Kandeler
15639d00ed ProjectExplorer: Prevent cascading "Replacement for" kit names
Fixes: QTCREATORBUG-26330
Change-Id: Id7abd00afb70fe2d2e3c1a43e2ea1298c0ff20cc
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-20 13:02:36 +00:00
Jarek Kobus
c292a4d591 Update qlitehtml submodule to incorporate the fix for broken shortcuts
The same happens in Creator.

Fixes: QTBUG-97189
Change-Id: Ib1e47176108d51ba6e7395cd7dfe0ab0325ea294
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-20 12:45:59 +00:00