Commit Graph

69993 Commits

Author SHA1 Message Date
Leena Miettinen
20533cc398 Doc: Describe viewing CMake output in Projects mode
Task-number: QTCREATORBUG-25642
Change-Id: I4c9ddf59bae1189e672b1a9a6129970ff3299744
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-28 13:52:39 +00:00
Christian Kandeler
7bf52b0c0d ClangCodeModel: Provide diagnostics via clangd
Change-Id: Ib45a62ebe200c2b56a1bb1a66f8a92103e60d092
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-28 13:22:36 +00:00
hjk
54b4022987 Utils: Implement FilePath::rename()
And uses it in CMake's fileapi reader.

Change-Id: I9e719aa4b253eaca17c6b304eab5e7268fcfab29
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-28 13:03:32 +00:00
Christian Kandeler
782779f8f4 ClangCodeModel: Remove outdated code
Diagnostics from clang-tidy and clazy do not take this route anymore.

Change-Id: Ifca2d9861d69dda94638277ec1210d28a3350b12
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-28 12:56:58 +00:00
hjk
a41524f08c QtSupport: Expand path variables only to local paths
It's what it used to do and actually better for the docker case where
the two only active use of these in form of %{Qt:QT_INSTALL_PREFIX}
are in a cmake build context that would require (device-)local path.

Long term we might want to use a variation of registerFileVariable
here without changing semantics on the user side.

Change-Id: If8dd77ac0b94ede41dbfe322802d5ef6c0b043ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-28 12:56:46 +00:00
Christian Kandeler
d083fd0227 ClangTools: Make version number available via settings
Change-Id: I9501f5a3234fb995a7ca3192adc1569febb8662e
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-28 12:56:31 +00:00
Leena Miettinen
e539ac263a Doc: Fix QDoc errors introduced by restructuring the manuals
- Remove an obsolete file
- Fix link targets
- Fix navigation link targets
- Fix conditional text

Change-Id: I2421be9867c350ec04b7a09489b0655de9bafa53
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-06-28 11:51:25 +00:00
Christian Kandeler
56cddf38b3 Clangd: Let users limit the worker thread count
This is particularly interesting for indexing, where users might prefer
a slower-building index with less CPU load.

Change-Id: Id44c58e9041df2857cd0772e71345673b14623f3
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-28 10:35:33 +00:00
Christian Kandeler
876cd8e975 Clangd: Allow to switch off background indexing
It is conceivable that users don't want to spend the extra CPU time on
this.

Change-Id: Ic3611c8d17d201ae986fad08b344369a8728ce1b
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-28 10:35:06 +00:00
Christian Kandeler
ba138a1855 CppTools: Add dedicated settings and settings page for clangd
We plan to add more clangd settings, and it makes sense to have a
dedicated place for them both in the code and the UI.

Change-Id: Ideb92935b7a5a6a98e07980f4011736fb82042d1
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-28 10:34:24 +00:00
Assam Boudjelthia
cd20ad8ff4 Revert "Android: add prepare_apk_dir CMake target by default"
This reverts commit 9dcbb8ca01.

Reason for revert: This workaround is not needed anymore, since
Qt 6.1.2 (see 71348437939e62b0e3b86888e966b300ff1e2855).

Change-Id: I089457dc58c5b97136b30190fdf17cfb303f8bd8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-06-28 10:29:10 +00:00
Assam Boudjelthia
f9a8e47d13 Android: Copy the target lib to android-build as part of the apk step
Make sure to copy the target's main lib file before building the APK.
If the lib file is already there, i.e. copied by the underlying build
system, this does nothing, but if the file is not copied by default like
in cmake with Qt 6, this would copy it and would save us having to add
*_prepare_apk_dir in cmake command.
Also, this could allow us to remove the step "make install" from
qmake step settings.

After this we could revert 9dcbb8ca01.

Fixes: QTCREATORBUG-25367
Fixes: QTCREATORBUG-25216
Change-Id: I243a16a32e2ea97e175c893470480c9d2c9b1e27
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-06-28 10:29:01 +00:00
Assam Boudjelthia
03712d6a92 Android: remove app lib_name field from the manifest editor UI
This field is supposed to hold the name for the *.so lib that
contains the main() function, ideally it shouldn't be edited by
the user, because some users might use the field to set an invalid
name or use the app's human readable name which is wrong.

Change-Id: Ie7feb79d6231d1785c29754ed277e057181e9ca0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-06-28 10:28:41 +00:00
Cristian Adam
3340fa88e4 CMakePM: Proper restore user saved CMake tools changes
If you had an auto detected CMake tool from the sdk you would
not be able to change the "Autorun CMake" state from ON to OFF
because the sdk value would always be used instead of the
user one.

Fixes: QTCREATORBUG-25911
Change-Id: Ibe3b393a2b9e4d397251018fda8a9508ad096791
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-28 08:07:42 +00:00
Cristian Adam
fc493c3fcb CMakePM: Resolve paths to build directories
With the default build directory template the CMake build directories
will be displayed as project-source/../build-project-name-kit-build-type
which can be irritating.

With this commit the build directory will contain the resolved path.

Change-Id: I968260caba5b9a47e1bda4eeaea386a04fe817b1
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-28 08:07:20 +00:00
Cristian Adam
20366297ed CMakePM: Keep always created run configurations up to date
Qt Creator will do an update of run configurations after a project
configuration.

If an always created target was no longer existing, it shouldn't be
part of the run configuration.

For some reason this was not the case for CMake projects.

With this patchset if a target's name is changed, the previous target
name is no longer part of the run configuration.

Fixes: QTCREATORBUG-25906
Fixes: QTCREATORBUG-24914
Change-Id: I086a2540eaad9039e41fb48194d5901c7be22be8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-28 08:07:06 +00:00
Johanna Vanhatapio
09e2e23797 Doc: Add info about multiselection
... in 3D Editor. Also add info and links about hiding/showing and locking components in Navigator.

Task-number: QDS-4626
Change-Id: I1f8713a9feed19029d9dfc6bb5064e2b936e2333
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-06-28 07:12:24 +00:00
Fawzi Mohamed
73c40bcefa qmljstools::LocatorData: improve safety
* check that we create LocatorData in the same thread as the
  ModelManagerInterface
* pass this as connect context, to ensure signal disconnect

Change-Id: I5e51af90c521fd8c83a6cfe2d105832f5a02a04f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 584f0476ec)
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-28 07:07:57 +00:00
hjk
d1300542bb Proparser: Don't crash on accidental remote files
Change-Id: I62ca1b17436fce21d582816388db497d82df6582
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-28 06:57:19 +00:00
hjk
6a826bd751 QtSupport: Claim support for any Qt version with docker
It's hard to draw the line, and it's only about a potentially missing
warning here.

Change-Id: Ie86905d0b8309297965133dedf636b6172a11757
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-28 06:57:10 +00:00
Eike Ziller
2e09518e9c Pass the new node in ProjectTree::currentNodeChanged
Avoids some roundtrips asking for ProjectTree::currentNode()
which traverses the project tree every time.

Change-Id: I650728eab5a47a7f4760cf88844a4b7106365255
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-06-28 06:55:51 +00:00
Leena Miettinen
1ae5787e38 Doc: Remove docs for Auto-create build directories CMake option
The option was removed, so removed also the docs and updated the
screenshot.

Task-number: QTCREATORBUG-25642
Change-Id: I61b3e01ad0b620bc7d2661a7a76deb53c7ffa238
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-28 06:47:17 +00:00
Bernhard Beschow
35021ec2da AutoTest: Turn pointer into value
... which avoids a raw pointer which needs additional "management".

Change-Id: I9c478b4043a563b00ced09de8366657eaf34c349
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-25 16:42:43 +00:00
Henning Gruendl
a842409d2c QmlDesigner: Fix minor property editor issues
* Fix infinity indicator in AnimationSection
* Fix property label capitalization and spelling
* Update import version and license header

Change-Id: If0eb6a0c00f17bbe1dcdacae73dca7be5e6faf8d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-25 15:18:10 +00:00
Pekka Kaikkonen
68ff37e630 QmlDesigner : QRC File integration
Split resource file generation into two actions. Take file from
current project into account. .qrc generation should take existing
.qrc file into account.

Task-number: QDS-4516
Task-number: QDS-4517
Task-number: QDS-4519
Change-Id: Iee15880657e456fbd74df505c10ee83a80ee64a7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-25 15:17:26 +00:00
Cristian Adam
f8a77287bf CMakePM: Add support for qtc_runnable feature
This will allow for the Qt Creator's CMake build only qtcreator
target to be selected as runnable.

Similar to qmake's qtc_runnable or Qbs's qtcRunnable features.

Fixes: QTCREATORBUG-25908
Change-Id: I6416873d0ad9cfec4960d98fc4b289ec98cc58b1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-25 14:24:41 +00:00
hjk
6d26f4f5b0 CMake: Allow autodetected tools to associate themselves with kits
Change-Id: I5b48ddf36ba1b9c4eb6476017be63c4d43b60627
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-25 13:57:36 +00:00
Leena Miettinen
a10728639a Doc: Update info about bookmarks
- Update screenshots
- Add subtitles
- Mention that notes are visible in Bookmarks view

Task-number: QTCREATORBUG-25642
Change-Id: I83e047306afb56382b5de21038beeaae1c00ecc4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-25 09:24:22 +00:00
Christian Kandeler
9706d89335 QmlDesigner: Fix warnings
- unused variables
- mis-ordered field initializations

Change-Id: I9f265799597e7c0f4f41cbb20edf19c48cae4c0e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-25 09:23:53 +00:00
Christian Kandeler
472f9c30d3 QbsProjectManager: Make use of qbs config --add-profile
... if available.

Task-number: QTCREATORBUG-25463
Change-Id: I7fc8a06a5c43b35c4b1b571504d31cc03a95b189
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-25 09:23:41 +00:00
Christian Kandeler
bd9bcdb925 QbsProjectManager: Simplify profile creation code a bit
Change-Id: I253671358955a970def0eb1343558135a38acaa2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-25 08:00:15 +00:00
Christian Kandeler
b52337aef9 QbsProjectManager: Make qbs version available in settings
We'll make use of this in a follow-up patch.

Change-Id: I851d607256617b02a3fedc3a370203a47a8db904
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-25 07:50:37 +00:00
Leena Miettinen
4e32999fab Doc: Describe different ways of editing bookmarks
Task-number: QTCREATORBUG-25642
Change-Id: I39bce45571643900f2dca4c695bba4247bc1e9ad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-25 07:49:58 +00:00
Alessandro Portale
d720a7fb21 Tracing: Use Qt5_VERSION to check the Qt version in CMake
Instead of QT_VERSION.

Change-Id: I466f4daee623b91aadda5160cc7dec104788f66c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-06-25 07:38:45 +00:00
Eike Ziller
9e8cfe1a41 macOS: Remove clangrefactoring/pchmanager from deployment
They are gone for real now

Change-Id: I653ed1ce1591d839a5ba01d00ef18c590d44100a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-06-25 07:15:11 +00:00
hjk
1fef4085bf Debugger: Support CLion based LLDB
Change-Id: Ie044def8c243a62734cc77a9eab29cbb1fa81e66
Done-by: Igor Lifanov
Task-number: QTCREATORBUG-14539
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-25 06:13:03 +00:00
hjk
2a5bdc893e Debugger: Robustify protocol
Chicken out of list parsing when an element can't be read.

Change-Id: Ia0c487c53984ee29ba1b561edc040aa1447493a6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-25 06:11:44 +00:00
Henning Gruendl
9895cd5df8 QmlDesigner: Fix minor property editor issues
* Remove minorQtQuickVersion
* Add missing PageIndicatorSpecifics.qml
* Fix label text in RectangleSpecifics

Change-Id: I3dc49c893a204416b742ae603ce2834b061db4d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-24 16:09:31 +00:00
Henning Gruendl
d5544c7aba QmlDesigner: Fix a few warnings and errors
Change-Id: Ie25fdc100a8288cd1b10ee186ab925c0ed13ee2d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-24 16:08:45 +00:00
Henning Gruendl
18f9a69f29 QmlDesigner: Remove QtGraphicalEffects from ColorEditor
Change-Id: I96772ddc67314d657c27e4d89f337b9c19c9684f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-24 16:07:36 +00:00
hjk
f295021d98 Docker: Give created devices an deterministic id
Change-Id: I451f37065b69da26000cb21ba92b070e6b5698d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-24 14:07:26 +00:00
Christian Kandeler
4ff26e2a27 CppEditor: Do not rely on object identity when comparing names
In particular, the same namespace can be declared in lots of different
places.

Fixes: QTCREATORBUG-25776
Change-Id: I7e255cee560043ed4beb47b8047f99c3a9c21198
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-24 13:46:25 +00:00
Johanna Vanhatapio
f1eaf25dff Doc: Decribe multiselection of assets
Task-number: QDS-4595
Change-Id: Ibc7a40af147416ac36f0b5436470906df6039329
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-24 12:16:02 +00:00
Christian Kandeler
627dd6681b Sqlite: Fix warnings
- use of uninitialized value
- unused local typedef

Change-Id: I60d6c3a9a04d9f603a102439582c9e55d85a191f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-24 12:07:48 +00:00
Christian Kandeler
b1837036b3 Fix some warnings about unused lambda captures
Change-Id: Icfb1b963b3c55656c760497e4ae3ece2bdccbbc7
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-24 12:07:31 +00:00
Eike Ziller
8f30ff6987 CMake: Show build directory when asking if it should be used
When changing the build directory to a new or empty directory, we ask if
the build directory should be changed and the project be configured
there. Mention the new directory in the dialog.

Change-Id: Ie4d7e9b132e6e90004e4d498b2182562375e7441
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-24 11:58:52 +00:00
Christian Kandeler
c6a4cd293b CMake: Fix initializer re-ordering warning
Change-Id: Iffcc4eb562a06ff12d641d23687dc4c44c797ce8
Reviewed-by: hjk <hjk@qt.io>
2021-06-24 10:35:59 +00:00
The Qt Project
957c5f3fc3 Merge "Merge remote-tracking branch 'origin/4.15' into 5.0" into 5.0 2021-06-24 08:43:37 +00:00
Eike Ziller
6bc9cddb9e Merge remote-tracking branch 'origin/4.15' into 5.0
Conflicts:
	src/plugins/cmakeprojectmanager/projecttreehelper.cpp
	src/plugins/coreplugin/mainwindow.cpp

Change-Id: Ie3a281b8635e79ca5fa794a127ed0039f33fe2ee
2021-06-24 10:43:10 +02:00
Leena Miettinen
a3fbc85ced Doc: Create a Prototyping chapter
Restructure existing information and fix navigation links.

Fixes: QDS-4470
Change-Id: I4a1118a4620527b461b99bf05b8b06d947018c80
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-06-24 07:54:20 +00:00