Commit Graph

68568 Commits

Author SHA1 Message Date
Ivan Komissarov
468e641b95 Update Qbs submodule to the top of 1.19 branch
Change-Id: I4226573dd4d4450ddc6e6f46b502dbd1251226f1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-26 10:04:46 +00:00
Eike Ziller
2fe1e881ac Merge remote-tracking branch 'origin/4.15'
Change-Id: I44dad4bbe9ed955d35c713485720a3f36a21874d
2021-04-26 11:59:13 +02:00
Marco Bubke
f69314b6ae Sqlite: Add range getter
Sometimes it is handy to return a range so you can break in a for range
loop. So you can now write:

for (auto [key, value] :
    statement.range<std::tuple<long long, std::string>>()) {
    values.push_back(value);
    if (value == Tuple{"foo", 23.3, 2})
         break;
}

for (auto [key, value] :
    statement.rangeWithTransaction<std::tuple<long long, std::string>>()) {
    values.push_back(value);
    if (value == Tuple{"foo", 23.3, 2})
         break;
}

It will only step over the statement to the break. So you don't fetch
not used values anymore. The second version will add a transaction
around the range.

But be careful. The range is view to the statement. Holding it longer or
reusing it can lead to strange behavior because the state of the
statement is changing.

Change-Id: I90191f7da5a015c7d8077d5bc428655a2b53246c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-04-26 09:42:40 +00:00
Leena Miettinen
288763d541 Doc: Update terminology and screenshots in Form Editor topic
Make the difference between components and component instances
clearer.

Task-number: QDS-3407
Change-Id: Ibb808696b49ccd465b3cb6706c8d76675fdd0b6e
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-26 09:38:24 +00:00
Marco Bubke
44b4c461ff Sqlite: Fix sqlite
Missed to remove the not anymore used ResultTypeCount.

Change-Id: Ia150e945bd650cc1e3d19fcb9426621d93fa16c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-04-26 09:06:50 +00:00
Christian Kandeler
90a07eca28 LanguageClient: Add the possibility to override progress messages
... and make use of it in the clangd client.
We want the progress bar for background indexing to have a better title
than the plain (and non-translated) "indexing" that the clangd server
sends.

Change-Id: Ib75eac370e7c22f0c5bd477f4a4c423283b27e1f
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-26 08:13:21 +00:00
Eike Ziller
c1f90aeca2 ICore: Change some path API to use FilePath
Change-Id: Id841d6177206a021c9e606ce560b47d1ae6e52b9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2021-04-26 08:03:47 +00:00
David Schulz
7dab5bd550 ProjectExplorer: Fix msvc toolschain abi compatibility
According to MSDN: "You can mix binaries built by different versions of
the v140, v141, and v142 toolsets. However, you must link by using a
toolset at least as recent as the most recent binary in your app. Here's
an example: you can link an app compiled using any 2017 toolset (v141,
versions 15.0 through 15.9) to a static library compiled using, say,
Visual Studio 2019 version 16.2 (v142), if they're linked using a
version 16.2 or later toolset. You can link a version 16.2 library to a
version 16.4 app as long as you use a 16.4 or later toolset."

https://docs.microsoft.com/en-us/cpp/porting/binary-compat-2015-2017?
view=msvc-160

So don't try to assign an older msvc toolchain to a kit that contains a
Qt build with a newer version of msvc.

Fixes: QTCREATORBUG-25618
Change-Id: If58676da5f61add1eed7e786862ee475e180b7dc
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-26 08:03:07 +00:00
Leena Miettinen
b3e0074126 Doc: Add links from all sidebar views to their docs
Update screenshot of Bookmarks view.

Task-number: QTCREATORBUG-25162
Change-Id: I00fc3c917ee4727e023c7f7374dbc3e31306551e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-26 07:53:17 +00:00
Johanna Vanhatapio
dd861cde73 Doc: Fix the path to Navigator
... in the 3D Node topic.

Task-number: QDS-3407
Change-Id: I7955faa90ce594adcfd0ab530fa4264a96667771
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-26 07:43:00 +00:00
Eike Ziller
79afbe7f14 COIN: Add hack to support debug info with sccache and MSVC
sccache does not support the "/Zi /FS" option for debug information
with MSVC. Optionally replace "/Zi" by "/Z7", which leaves debug
information in the object files and only collects it at link time.
See also qtbase 2354274f39934b94383923834479901106489def.

Change-Id: Id94c2116f3c4192556dbdf8fe82b12ce0a204273
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-26 07:01:51 +00:00
David Schulz
b2c0554733 LanguageClient: add global action to open inspector
Change-Id: I3dcd6cdf716e68e2d7bedb24e1db372d93683698
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-26 07:01:22 +00:00
Eike Ziller
86f0d72b2a Look for jom also in "jom" subdirectory
Jom is currently installed into the Qt Creator bin/ directory directly,
but it can be considered unsafe if we add that to the PATH. Look in a
subdirectory for it as well, as preparation for moving it there instead.

Task-number: QTCREATORBUG-25585
Change-Id: I85b379fa093c57639875872868c16b5cc964f4aa
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-26 07:01:12 +00:00
Eike Ziller
b264770e17 FilePath: Return QString copy from toString()
Returning a const reference is different from our usual coding style,
and can lead to crashes when assigning to a const reference, like

const QString &path = filePath.pathAppended("foo").toString();

Make it behave like our other API.

Change-Id: Iab1cf1a944be405227b135c12029f58869893911
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-26 07:00:47 +00:00
Christian Stenger
1effc86642 AutoTest: Fix crash on closing a project
If the check state of a tree item changes due to closing
the project and there is no other project open we access
a nullptr.

Change-Id: Ib08031e19eaae0837d1dc0485a05756cd8d0c0dc
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-26 06:22:42 +00:00
hjk
cac3736b52 QmakeProjectManager: Un-export QmakeMakeStep
Not directly used in leaf plugins (iOS?) anymore.

Change-Id: I5fcf7e0d976e99b5d9eb8b0e6404651b35d5db43
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-26 06:22:00 +00:00
Vikas Pachdha
0e89a21c6d Docs: Acknowledge slow export from Photoshop
Task-number: QDS-2194
Change-Id: I70cfd43d80a3438b9020a5842cd35c47628d6e95
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-23 16:15:01 +00:00
Ivan Komissarov
7ab2e885cf Update Qbs submodule to the top of 1.19 branch
Change-Id: I65ce1708de1e3c4b6a7fdc21c6bc7f4e93971be7
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-23 15:52:58 +00:00
Johanna Vanhatapio
2043b91ebe Doc: Add more links to topics covering views
Also some miscellaneous fixes.

Task-number: QDS-3407
Change-Id: If47cdb0b7bc16f3fc624b96c2e0dabfde2d2f2db
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-23 14:40:14 +00:00
Miina Puuronen
ca3b8f3b32 QmlDesigner: Fix Component Library category collapsed state
Set category collapsed state only after checking the status of category
and not during it.

Fixes: QDS-4227
Change-Id: I4771a8641174ac2f0413b3ff2380dd8dbb77742f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-04-23 14:36:57 +00:00
hjk
a916c0a235 QmakeProjectManager: Code cosmetics
Namespaces...

Change-Id: I8014c932895ebaea78319b22d2693de16f270fc4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-23 14:30:40 +00:00
Johanna Vanhatapio
a4d1beca2d Doc: Update info about Component
... in Concepts and Terms topic. Also added some links to Creating
Components.

Task-number: QDS-3407
Change-Id: Iea2314c40ec5edb906ca0e23b9d7dea48cf6c597
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-23 13:34:41 +00:00
Miina Puuronen
5c2a95b035 QmlDesigner: Fix Component Library context-menu option disable state
Update the state of categories hide state property when removing a
module so that "Show All Hidden Categories" context menu option enable
state is updated after removing a module.

Fixes: QDS-4226
Change-Id: I7c963e92e6e94e28856a5e51f75ae618b3b684ec
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-04-23 13:14:51 +00:00
Eike Ziller
eef041a1a8 QmlDesigner: Fix build with Qt 6
error: non-constant-expression cannot be narrowed from type 'qsizetype'
(aka 'long long') to 'int' in initializer list

Change-Id: I743f942fb0bef9f907b4facbb346264dfeaad778
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-23 10:30:05 +00:00
hjk
77fd9661ec ProjectExplorer: AbstractProcessStep code cosmetics
Namespaces.

Change-Id: I7781bcf7125ad854e05a3b3a6a97d0c39b76df69
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-23 10:10:29 +00:00
hjk
9dfdb9f0a2 QmakeProjectManager: Some code cosmetics
Namespaces, foreach, parantheses.

Change-Id: I641811d66970cbb275688a73c8765be00ba295bb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-23 10:10:23 +00:00
Robert Löhning
8d813b8864 Squish: Remember where breakpoints are
So we don't have to update the test each time
Creator changes the project templates.

Change-Id: I76f96f719895f2f8cadccaf9c91cc85d1735ce13
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-23 09:45:06 +00:00
Leena Miettinen
5bf2bfedb0 Doc: Update Connection View name in Backends topic
Update screenshots.

Task-number: QTCREATORBUG-25162
Change-Id: I57dab115a5fca8830e867b57a31ff38fc1b6d20d
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-23 09:06:37 +00:00
Leena Miettinen
3ef12a15dd Doc: Describe Signal List dialog
Fixes: QDS-3563
Change-Id: I6d17ab457a1b4d22f013dae55c5de7ee66dc6e38
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-23 09:06:22 +00:00
Leena Miettinen
4f972e0296 Doc: Update Log In UI tutorial after button wizard fixes
Task-number: QDS-4211
Change-Id: Ib732386a15a4ee9361800909da9542ae73069367
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-23 09:06:10 +00:00
hjk
29ac812cf4 Clang: Compile fix for qmake
Change-Id: I88fa2c995a22a2fe3bf3a0aac05c0432e4b3d379
Reviewed-by: hjk <hjk@qt.io>
2021-04-23 02:06:38 +00:00
Cristian Adam
1646d9ffc4 clangpchmanagerbackend: Allow building with Clang 12
Change-Id: Ie10b5fde2ca1ba81943083c0533f2037125982f5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-22 17:33:19 +00:00
Johanna Vanhatapio
ac36a9616d Doc: Fix the spelling of Connection View
...and add links to the Connection View topic.

Task: QDS-3407

Change-Id: I48c2fa8e4ebbed8c8b8ddd0b68da80527d602a1d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-22 17:27:03 +00:00
Johanna Vanhatapio
6030512d6a Doc: Fix \uicontrol in Lights topic
Change-Id: I812eb86269a24e828572588e7580ef0c003f02f5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-22 13:54:45 +00:00
Leena Miettinen
f96fd9b319 Doc: Update Log In UI tutorial part 4
Add links to new topics and the tutorial video.

Task-number: QDS-3407
Change-Id: I03b5e3b7dff69de6cd6dbb6492615e9712000460
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-04-22 13:52:48 +00:00
Christian Kandeler
7b408a9a7a ProjectExplorer: Tighten the LdParser a bit
Just a hotfix. This parser is still much too eager, and a lot of unit
tests only pass because it wrongly matches things that should be caught
elsewhere.

Fixes: QTCREATORBUG-25617
Change-Id: I91161a103b41239c3aac9e119c21e152b0437a32
Reviewed-by: hjk <hjk@qt.io>
2021-04-22 13:50:28 +00:00
Thomas Hartmann
5d9405a8ed QmlDesigner: Assign default to NumberAnimation
Task-number: QDS-4215
Change-Id: I62831276b36767c290e2be29f9a87b94079b7552
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-22 13:33:20 +00:00
Leena Miettinen
90d987b266 Doc: Update Log In UI tutorial part 3
Task-number: QDS-3407
Change-Id: I3e6acd2731b4f00fdfb8ab2f21e39f73fe4bad4f
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-22 12:27:07 +00:00
Eike Ziller
45602754d9 Only globally suppress "Link with Qt" if explicitly requested
If the user actually links with a Qt installation, the note is not shown
again. But if the user installs a different Qt Creator that is not
linked, it should be shown again.

After the user presses "Do not show again", it really will never be
shown again.

Fixes: QTCREATORBUG-25502
Change-Id: Ic3b6f46c318e4b8aa6b189e712b01f2c3d4a2b1d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-22 12:26:09 +00:00
Christian Kandeler
e27b367bdc ClangCodeModel: Introduce dedicated class for clangd LSP client
Makes sense for modularization purposes, and it will soon get additional
functionality.

Change-Id: Ie8163d352fc408b4167ee2ce6147aa1fb19528eb
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-22 12:07:49 +00:00
Johanna Vanhatapio
0b4362b326 Doc: Update info about positioner properties
Task-number: QDS-4167
Change-Id: I618910ab0e31084c4e9b67858842b461421b9f8a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-22 11:17:59 +00:00
Cristian Adam
169614d8b1 CMakePM: Setup conan path from Qt SDK
Read and prepend the conan path from Qt SDK which is set in
QtCreator.ini.

Fixes: QTCREATORBUG-25553
Change-Id: I1404064ca253cb968d19bca253f1bb781209d0bd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-22 10:44:50 +00:00
Eike Ziller
ebc0331306 sdktool: Re-add compatibility hack for old language IDs
This was removed in 6baf09bf91.
Even though sdktool doesn't need to write these old IDs anymore, it
still must support them for --language for a while, because older Qt
installer components still use the numerical values (and will not be
updated).

Task-number: QTBUG-92949
Change-Id: I7483e52e331fe676b60d7b401f8a6f6510fd1789
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-22 09:30:54 +00:00
Eike Ziller
63f7ba0427 Toolchains: Improve warning message for wrong language ID
State the ID and where it comes from

Change-Id: I8bdf9e38b2a1d3a00409cfa680f1079e5a048eba
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-22 09:14:17 +00:00
Christian Kandeler
ecafdb7543 ClangCodeModel: Add experimental clangd support
If the user has enabled clangd (default is off), we start up one instance
per project when it is opened/changed (including build config switches),
and trigger background indexing.
So far, the index is used to provide results for locators and "Find
Usages".
Per-document functionality such as semantic highlighting and completion
is still provided by libclang.

Change-Id: I12532fca1b9c6278baab560e7238cba6189cde9f
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-22 07:32:58 +00:00
David Schulz
8bacd9bdc4 LSP: add std namespace to nullptr_t usages
Change-Id: I2bc3e7324c168201a4755bec6f79c5aa6ffc8540
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-22 07:15:28 +00:00
Christian Stenger
44a33d4c2c LanguageClient: Fix possible nullptr access
Fixes: QTCREATORBUG-25528
Change-Id: I23d50b8bb0a3112eab3eac6a9300e2783b8bb939
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-22 04:36:42 +00:00
David Schulz
b3c2120dff Editor: add specialized snippet overlay
Split out the snippet functionality into a new derived
overlay implementation.

Change-Id: I2d7fffabe16ce6348ed067eb52ff221420a23285
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-22 04:14:19 +00:00
Alessandro Portale
8b59604bd4 Docker: Add a build step
Let's have a build step which allows running a command on a registered
Docker image, which is defined by the Kit's build device.

If the build device is the Local PC, run the command locally.

This specialized build step will most likely be removed after the
existing steps have been taught to run on the Kit's build device.
For now it is part of a POC that allows to experiment with non-local
build commands.

Task-number: QTCREATORBUG-22362
Change-Id: Ifda503ee346b67857a5b82c05cb38cf7f63698d0
Reviewed-by: hjk <hjk@qt.io>
2021-04-22 00:10:12 +00:00
Robert Löhning
aaa5b93b2e Squish: Simplify API of doSimpleDebugging()
No need to pass a value which never differed from len(...)

Change-Id: Iea481abed0ebfa9acf05456bc2ff1f01c7bc0d1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-21 17:27:31 +00:00