Commit Graph

62421 Commits

Author SHA1 Message Date
Artem Sokolovskii
5805208cec CorePlugin: Use FilePath istead of QString
Task-number: QTCREATORBUG-2616
Change-Id: Iaa5bc7946a7bddfd8adffe51906d90b2e76f5837
Reviewed-by: hjk <hjk@qt.io>
2021-08-30 10:39:41 +00:00
Eike Ziller
987ad3fe9c Merge remote-tracking branch 'origin/5.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/android/androidconfigurations.cpp

Change-Id: Icd2b0fda2b2653656285bbbe457c30c9cd414d3f
2021-08-30 12:15:37 +02:00
Jarek Kobus
c145f95952 Add a virtual destructor for the LauncherSignal base class
Move qDeleteAll into cpp file, as LauncherSignal is defined there.

Change-Id: I59ed1de2025c3f62196e1c676accf26b3fb813ac
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-30 08:29:50 +00:00
Artem Sokolovskii
90a9185137 iOS: Use QtcProcess
Change-Id: I758a5de16d51124eeaff15385abae094df548096
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-30 08:25:19 +00:00
Christian Kandeler
263d8fb5d7 QbsProjectManager: Make C++20 projects work with MSVC
Task-number: QTCREATORBUG-26089
Change-Id: I9f37ca3024f95a41724bf7b4e48ee8dbd340cd75
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-30 08:23:43 +00:00
Christian Kandeler
49211c4a5c CppEditor: Move FollowSymbolTest into the Tests namespace
This is now possible, as there is no ambiguity anymore regarding the
TestDocument class.

Change-Id: I6f736a5790d2eab1c82f5429a9292aa9d7bcda56
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-30 08:22:10 +00:00
Christian Kandeler
5fe3ead73e CppTools/CppEditor: Rename the TestDocument classes
It was not helpful that we had four different classes with the same name.
Note that they look suspiciously similar and could possibly be merged
into a single class at some point.

Change-Id: I7d4c10a09408226037bc0d276940bca39dc5f576
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-30 08:21:57 +00:00
Tim Jenssen
96d7c1fa2f qmldesigner: fix "list is empty" warning
message was: "QFileSystemWatcher::removePaths: list is empty"
now calling that method only if there is something in the list.

Also tried to make the code a bit cleaner

Change-Id: I029d100e63cf42eb58757a144fecaaa8c8c908a0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-08-30 08:20:42 +00:00
Eike Ziller
a087bda442 LSP: Do not sort completion items if none sets sortText
It is unclear if and how the client should order completion items, but
at least haskell-language-server provides a sensibly sorted list (not
alphabetically) and doesn't set a "sortText".
Sorting the items alphabetically by label messes up the prioritization
of "best" matches that the server correctly does.

Only sort, if any item has a sortText.

Task-number: QTCREATORBUG-26114
Change-Id: I55a966763e21ba8b85085a087c37e6005438d4e3
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-08-30 08:16:55 +00:00
Eike Ziller
940a203d93 LSP: Set client working directory to project directory
If the server settings specify that a server is to be started "per
project".

This fixes e.g. running the haskell-language-server

Fixes: QTCREATORBUG-26115
Change-Id: If10af71d60786826a9218b4b98818df8d9710adf
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-08-30 08:16:38 +00:00
Miikka Heikkinen
1d5ddbf8f8 QmlDesigner: Fix update of effects after initial drag from library
Effect source type was set to incorrect after the initial drag to the
scene, so even resetting puppet wouldn't make a newly added effect
show up. Fixed by updating the NodeSourceType when updating the node
source.

Also reset the puppet for now when node source changes, as it doesn't
handle source changes properly.

Change-Id: Id22a298738fb1e7f841b94b473ccb61cc82e0322
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-30 08:02:00 +00:00
Christian Stenger
d96d9c1f3d PE: Fix file pattern regular expression
If the warning contains chained warnings we end up grabbing
too much and the file path is corrupt which also ends up
in strange visual issues on the issues pane.

Change-Id: Id343935ec933026d461d6572e7e5f4e15dc3da74
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-08-30 04:38:13 +00:00
Alessandro Portale
2d994620d1 Utils: Fix setting the path via slotBrowse()
Amends: 0d7f357294

Change-Id: Iae5e13b5d4d869d7e727f614f540767fca32d770
Reviewed-by: hjk <hjk@qt.io>
2021-08-27 14:31:08 +00:00
Christian Kandeler
59d2f96cf8 CppEditor: Use test objects to group related test functions
Change-Id: I65089f2a00d8d168f123becf160f82bfcca4c68c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-27 13:46:45 +00:00
Christian Stenger
eead213d40 Help: Fix cmake build condition
Change-Id: I528df210b5ea56ecb0c5b629876e0eea465d75b2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-27 13:38:17 +00:00
Christian Kandeler
a952500e90 CppTools: Use only const pointers for ProjectInfo and ProjectPart
All members were already const, but this makes it clear at all points of
use that these data structures are immutable.

Change-Id: Iea615c090bde462c445d15223caccc561b0c713d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-08-27 10:53:54 +00:00
Christian Kandeler
5d8551559a CppTools: Replace a QMutex with a QReadWriteLock
... in CppModelManager. Not all accesses are mutually exclusive.

Change-Id: I87fb50db35c5fdfa401f08ad221ca053911eac07
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-08-27 09:08:13 +00:00
hjk
3b75ca96d6 Utils: Remove FilePath::isWritablePath() uses
And fix remaining users.

Change-Id: I41c27908f2e9f1e253d0b51830ba351b29a84ec5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-27 07:05:29 +00:00
hjk
101fda5997 BinEditor: Proliferate FilePath use
Change-Id: I1676ab03257b5acdc1f67e25f419939939707d53
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-27 07:03:26 +00:00
hjk
df939e15dd Valgrind: Remove some unused QObject parent
Change-Id: Ieef2c25d64b4a82743ce25da54c9d364548eb8d6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-27 07:02:46 +00:00
Laszlo Agocs
491bd18d1f Update scenegraph API check in isUsable
Do not test for OpenGL-through-QRhi, but rather for
anything-through-QRhi. The implementation of the profiler
views is not tied to OpenGL anymore. That said, QQuickWidget
implies using OpenGL as of now, so in practice we will always
have OpenGL at best, but update the tests now to be better
prepared for the future.

Change-Id: Ic43eac1c5cf0e2ce2ef35cdd8a29b475884a5af8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-08-26 16:38:18 +00:00
hjk
9929d3dd73 ProjectExplorer: De-noise project.cpp
Namespaces, some inlining.

Change-Id: Ib6e8e0440e69492c1f486ae0358d8d59bafbfefb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-08-26 13:17:29 +00:00
Assam Boudjelthia
b3a12e1ab9 Android: Don't register multiple debuggers for each ABI
After NDK r10x, there's one common gdb executable instead
of separate for each ABI. Currently, multiple debuggers
are being registered for each ABI although they all share
the same command. Apart from simplifying the list of debuggers,
this will make it less time consuming where each NDK can register
one instead of 4 debuggers.

Also, there was two functions handling debugger registration for
the default NDKs and another for custom ones chosen manually by
the user. Now, they are merged together instead.

Change-Id: I886b6fa8eb2190e630189f9002e7a44cd18c7b71
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-08-26 10:58:04 +00:00
Eike Ziller
0777b65db3 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	src/plugins/android/androidconfigurations.cpp

Change-Id: If8dc2cdf131811e08ca147c6f58dbb3ed3bf7227
2021-08-26 11:09:08 +02:00
Christian Kandeler
245b6c0dc7 CppTools: Use test objects to group related test functions
Change-Id: I9ed2ad222579f49c20c75a53c862bb7251cff28d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-26 08:38:44 +00:00
Assam Boudjelthia
cd8da8fe5f Android: Get the minimum sdk level based on the used Qt version
Currently, Creator gets the minimum sdk version from a hard-coded
value (16) which is used for all projects. However, this is not ideal
because some Qt versions require a specific sdk level to build and run
properly. So, this change ensures that the minimum sdk value is obtained
based the Qt version used in the project.

Fixes: QTCREATORBUG-26127
Change-Id: I948dd18d16c3d9ca587ad7712aa4c9a1bfd53972
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-08-26 08:03:09 +00:00
Eike Ziller
34a884a52a Android: Clean up messed up kits that were created by Android plugin
No idea how to reproduce, but it can happen [1] that stale Android kits
appear in Qt Creator, which have broken combinations of Qt version and
toolchains. The Android plugin updates the Android kits at startup,
but only updates known "correct" kits, or creates new ones.

Additionally remove any previously auto-created Android kits that
were not recognized to be still usable.

[1]: probably after switching between a working Android setup and a
broken one, with broken toolchains/debuggers brought into the mix

Change-Id: I709f52df62f8998647e4d68bdfe76015e8941ab8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-08-26 07:19:46 +00:00
hjk
30f171a491 Utils: Rename FilePath::normalizePathName to normalizedPathName
Change-Id: Ib7bcc9968749649f762a396d3861f7b67711e926
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-26 07:03:13 +00:00
hjk
9a0285ba0e SilverSearcher: Use more FilePath and QtcProcess
Change-Id: Ifbc1108885d0dfc67c09bd6f5cacaef902a2bf54
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-26 06:56:52 +00:00
Jarek Kobus
1ac36b08f1 Ensure LauncherInterfacePrivate::doStop() is called on shutdown
LauncherInterface::stopLauncher() ensures now that a posted call to
doStop() is being executed before we delete the laucher's thread.

Change-Id: I80f4136810e113bcaa1427eca7906d710cc770de
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-25 15:41:33 +00:00
Martin Kampas
acf0ee9fbf RemoteLinux: Word wrap long messages in SSH key deployment dialog
Change-Id: I1a7ee450a48ee2f16df4dde4df2b79007f23638f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-08-25 14:49:11 +00:00
hjk
2d019ed659 Android: Further FilePathify AndroidBuildApkStep
Change-Id: I98073dfc74baaa145867cae64e4b23735e3c730d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-08-25 14:40:34 +00:00
Christian Stenger
ea2b4872a9 QmlDesigner: Fix compile
Amends a9d730dfb9.

Change-Id: I484353822fa42c0857ba4950cbfdddc063f14843
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-08-25 14:22:09 +00:00
Artem Sokolovskii
d3ff45ad8b Utils: Use QtcProcess
Change-Id: Ia3cd4706c6b23a17bc4d84d06018ad16a4e3f428
Reviewed-by: hjk <hjk@qt.io>
2021-08-25 13:38:58 +00:00
Artem Sokolovskii
e3d87f9d0f Use QtcProcess
Change-Id: Ie41a40534f231c68797205e4dd817f5e98963b07
Reviewed-by: hjk <hjk@qt.io>
2021-08-25 13:38:52 +00:00
Ivan Komissarov
53019b45dc Update Qbs submodule to the top of 1.20 branch
Change-Id: I7a9c15344b821a9d3773c0a4585cb7e6af0adc37
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-08-25 13:21:35 +00:00
Christian Kandeler
16df6164b0 MSVC: Consider build environment when calculating header paths
Fixes: QTCREATORBUG-25816
Change-Id: Id6274d2bec4ed3db07729f1d88a5a9ad82c8d98d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-25 13:02:02 +00:00
Artem Sokolovskii
e1cfaaeaca Utils: Make parameter workingDirectory optional
- made parameter workingDirectory in startDetached function optional

Task-number: QTCREATORBUG-26169
Change-Id: Ia8bf10455fc5c26cec4372005a230a919e955b10
Reviewed-by: hjk <hjk@qt.io>
2021-08-25 12:56:17 +00:00
hjk
6b417333c8 Android: Use guard object in some lambda connects
Change-Id: I004d2729d2502a7f2159ea1713cafaabbeb6cc72
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-08-25 12:35:45 +00:00
hjk
ca735829b4 CMake: Bark about missing build directory
Also, bail out earlier and more directly.

Amends e54c63af5e

Change-Id: Id5a530b3d6f7548a2f786f3400454253c719acce
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-25 12:34:55 +00:00
Artem Sokolovskii
48b4af21aa Vcs: Use QtcProcess
Change-Id: I5fb19144b17b817a783fcf927f3a74dbdaaa97ab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-08-25 12:28:39 +00:00
Thomas Hartmann
a9d730dfb9 QmlDesigner: Add support for Vector4D
SpriteParticle3D colorVariation is a Vector4D.

Task-number: QDS-4876
Change-Id: I756f7a688266d67be1b275d4151874befefc0530
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-08-25 09:52:44 +00:00
hjk
7c17c00efa Android: Use QtcProcess in AndroidSignalOperation
Plus some code cosmetics.

Change-Id: I8e0e16a2649dbb616af4e0ba076557d94a778467
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2021-08-25 09:51:49 +00:00
Jarek Kobus
7814605215 Don't start the process when being in running state
Assert that we are in NotRunning state when starting a process.
Otherwise we issue a warning and ignore the new call.

Change-Id: Ie8c007851aabb4b814c1fd49bc8d01f22eb1a563
Reviewed-by: hjk <hjk@qt.io>
2021-08-25 08:36:31 +00:00
Jarek Kobus
f6de80753c Delete any pending signals in caller's destructor
Change-Id: I5b1ec32c64daf619cb0efabaf7d0688cefafd6c9
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-08-25 08:33:11 +00:00
hjk
d23afee096 Android: Use FileUtils in SplashScreenContainerWidget
Change-Id: I6c03e3c99f676b79e673c272e838788ac7a0d3c7
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-08-25 08:19:25 +00:00
Jarek Kobus
5fe210c7db Merge multiple ready read signals into one
This minimizes the amount of readyRead() signals emitted.

Change-Id: Ibd2409d6f273a2781839a73220cf41e57a941e54
Reviewed-by: hjk <hjk@qt.io>
2021-08-25 07:04:28 +00:00
Christian Stenger
6f0c56b6fd SdkTool: Fix build with qmake
Change-Id: Idb8da7fa75d6cac02aae5bc41a418069bf62ca16
Reviewed-by: hjk <hjk@qt.io>
2021-08-25 06:48:33 +00:00
hjk
e54c63af5e CMake: Bark when selected cmake binary and build dir on different hosts
Change-Id: I31d373cb6a87c65dbf42ae4e0b295d41f94d9f63
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2021-08-25 06:37:45 +00:00
hjk
bbe506d29b Docker: Show error when container environment retrieval failed
Change-Id: I2e2226493969e322c9dab44ceb5106b1a207369b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2021-08-25 05:38:54 +00:00