Commit Graph

69993 Commits

Author SHA1 Message Date
hjk
0e0cfcdcf2 Debugger: Claim usability also for docker devices
Doesn't work correctly yet, it effectively runs in a host environment.

Change-Id: I2aaf7d1b04ca38f9a0825edf78e264ceaed0434b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-18 09:17:35 +00:00
Thomas Hartmann
e1c90bf047 QmlDesigner: Extend tst_TestCore::loadQml()
We should check for the version. For this we have to enable
semantic errors.

Change-Id: I8bedca041ebf9bbc0580b89076203e47942cc539
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-18 08:04:45 +00:00
David Schulz
0fb40e204b Core: remove unused helper functions
Change-Id: I74ef89648f42f0016ad7cdfc61e17a712ea145ff
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-18 07:17:36 +00:00
David Schulz
aa4b926f02 Core: filepathify documentmanager guts
Change-Id: I2e01adb0fec592fd8401b60015e8a0464d3c8e4d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-18 07:17:27 +00:00
Leena Miettinen
f0cb3e7282 Doc: Readd an \endif that got accidentally removed
Change-Id: I2de23604506d86d72fcf9cf3dd093b7e6f30910d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-18 06:42:14 +00:00
Tim Jenssen
84af58818d help: do not build webengine backend if Qt6 is used
Change-Id: I66ef10b3991c70913999b71ce382dbcfabff7fd6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-17 17:07:50 +00:00
Tim Jenssen
77fd87a545 fix Qt 6.2 build
Change-Id: I426879c9ac8e1db84a39789d00e73498216e089c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-17 17:07:42 +00:00
Eike Ziller
487e4a2e51 unittest: Add missing tests (QmlDesigner, ClangTools and a few others)
Ups it to 2487 tests from 110 test suites.
(from 1963 tests from 91 test suites)

Change-Id: Id601bc8bbd43f129956be812e30a94081098c3cb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-06-17 14:44:20 +00:00
Mahmoud Badri
4ed8ee5aea QmlDesigner: Fix crash when dropping an external asset into a subfolder
Task-number: QDS-4429
Change-Id: I230d34dc923acfb3321cbbca5787376b5c9a7078
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-17 14:37:35 +00:00
Mahmoud Badri
e0c89a91e0 QmlDesigner: Fix asset library shader icon
Also fix showing correct icon when the asset's extension has uppercase
characters.

Fixes: QDS-4583
Change-Id: I697f13c10d475d07dbcd44299a427190e1a8681f
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-17 14:37:14 +00:00
Thomas Hartmann
03985dd55e QmlDesigner: Use QtQuick 2.1 imports
QtQuick 1.1 is not supported anymore.

Change-Id: Ibfeba6f2e0617892ea823d1043344502e4617b7a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-17 14:34:57 +00:00
Thomas Hartmann
4642dc3518 QmlDesigner: Trim strings in tests when comparing
We use a NonIndenting rewriter and do not test the indentation.
Therefore we can trim white spaces.

Change-Id: I16e4acbbbc69568549cb679d988ff951b68f33b0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-17 14:32:53 +00:00
Thomas Hartmann
6dba941b3f QmlDesigner: Use QtQuick 2.15 instead of QtQuick 2.1
QtQuick 2.15 is supposed to work and we can use it in some tests.

Change-Id: Ic3f6505dd5c683ec6521015b5dcd6c8f83a1171e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-17 14:28:37 +00:00
Thomas Hartmann
add272dbbb QmlDesigner.Tests: Use simplifiedTypeName for QtObject and Component
It is ambiguous if QtObject and Component come from QtQml or QtQuick.

Change-Id: I2e1dd48d80ee7aec8293eac85160d62a584c2819
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-17 14:28:29 +00:00
Mahmoud Badri
5369aea1ed QmlDesigner: Implement multi-selection in the asset library
Multi-selected assets can be dragged to the form editor
and navigator. Also increased font size for newly
created text as it was so small and some relvant
cleanups.

Change-Id: Icf28b627a8392309520b7071209812e1ae051e84
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-17 12:21:16 +00:00
hjk
0945b8d0dc ProjectExplorer: Properly expand variables in remote working directories
Change-Id: Ie507a72cac23ef3145ea967eb01f7b8f154c9450
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-17 11:52:56 +00:00
hjk
bf7bc78762 ProjectExplorer: Use local paths for Compiler and Qmake executable
... for variable expansion.

They are used in the context of buildsteps, running locally on
the build device.

It's also pre-docker behavior were all paths were local anyway.

Change-Id: I5d7cdc744678b0e7d09363fa1a3f3adc0cef4e02
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-17 11:50:08 +00:00
hjk
3721f60934 Qmake: Make executableFor() return a FilePath instead of QString
Change-Id: Ie7e0432080577aedb9c8a4be2d20388afbdce349
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-17 11:41:38 +00:00
David Schulz
f66df921d7 Core: filepathify file renaming
Change-Id: I3d4f39e34e65cde3df7b7c19570e3a54d0625d53
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-17 11:13:51 +00:00
Björn Schäpers
55b91a7617 clangformat: Fix build with LLVM 13
Change-Id: Ia9db10696fd129c8b989ecc4c9ecbb7f1f10e68c
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-17 10:17:38 +00:00
Kai Köhne
bf04c98c1c Do not pass QStringView by const reference
That's what the documentation says:

  https://doc.qt.io/qt-6/qstringview.html#details

Change-Id: I0b41fc4abad1601c0ed416a505534cf7ae7633e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-17 09:54:42 +00:00
Cristian Adam
4bfcea22bf CMake: Allow standalone build of unittests
tests/unit/CMakeLists.txt needs to be opened for standalone usage.

Change-Id: Ib763dedd09ee00bc793b56d87456981b71f4004c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-06-17 09:39:58 +00:00
David Schulz
5ae15f945f LSP: prevent comment warning
Change-Id: I269c1efe9e297daceb7bb030a3eec321616f7f66
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-17 09:31:38 +00:00
David Schulz
b099d98a17 Utils: add permissions() to FilePath
Change-Id: I89082550a4f053c400d13a34df4f9c09c65bc326
Reviewed-by: hjk <hjk@qt.io>
2021-06-17 09:31:09 +00:00
Christian Stenger
354a0b17ab AutoTest: More filepathification
Change-Id: Ibb76f4332fa2e682709520cebe5e243dc3b70bb2
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-17 08:30:48 +00:00
Christian Stenger
5482109c05 AutoTest: Avoid unnecessary conversion
Change-Id: I9abe511101614802ef887cb51e45fe2b6ccb3218
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-17 08:30:35 +00:00
David Schulz
d7dda80ee2 LSP: prevent accessing already deleted client
Change-Id: Ifdafc77282079b8f99378047e89bbbe44599eebb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-17 08:10:37 +00:00
Miina Puuronen
c5056eed23 QmlDesigner: Context menu for Assets Library
Added context menu for Assets Library. Assets directories can now be
expanded or collapsed. Rootpath is skipped to make sure subdirectories
headers stay visible.

Task-number: QDS-4488
Change-Id: I5377ba9e9837bae6fad1571780a16b65ed6eefff
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-17 08:02:30 +00:00
David Schulz
3b127c04e8 Utils: add rename function to fileutils
Change-Id: Iaf47744819c21013661e3bd0275a04c1d68e9023
Reviewed-by: hjk <hjk@qt.io>
2021-06-17 06:35:40 +00:00
David Schulz
410b02f8c5 Core: filepathify expected document changes
Change-Id: Ifa9341e55c79459db9ecef3c441da9b2816695bf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-17 06:30:51 +00:00
Christian Kandeler
072958c3b0 ClangCodeModel: Do not include base declaration in virtual overrides
... if the cursor was on it.

Change-Id: Ie0d6981e9f0d23a57c430f3aa33448e8f9002ee9
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-17 06:13:37 +00:00
Christian Kandeler
3e5621428b ClangdClient: Handle C files
We somehow forgot to add the corresponding mime type to the language
filter.

Change-Id: Idefe2ed1dfe689340dabcf98363b3d160168000b
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-17 06:13:15 +00:00
Christian Kandeler
692995ec88 ClangCodeModel: Tighten the check for qualified member function call
Just checking for the base cast is not enough.

Change-Id: I455533b7da31cf5c52d8c1b9dd93b3bb2fb58929
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-16 15:30:29 +00:00
Jarek Kobus
d4c36f43b0 Protect the access to module path for executable cache
The getPylsModulePath() may be called concurrently:
PyLSConfigureAssistant::openDocumentWithPython() ->
runAsync -> checkPythonLanguageServer() ->
getPylsModulePath(), so protect the access to the
static cache by mutex.

Amends: 54f2ebf91d

Change-Id: Ia88a9e680b092bcc7cf62338387775521d497835
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-16 11:41:58 +00:00
Eike Ziller
905f5d4e1b Merge remote-tracking branch 'origin/4.15'
Conflicts:
	coin/instructions/common_environment.yaml

Change-Id: I2084c24f7e052b9647b30f810207b3c8beecce3c
2021-06-16 11:48:08 +02:00
hjk
e3c03fd3c5 Utils: Implement FilePath::writeFileContents()
Including a docker version of it.

Change-Id: Ib2ac6073cc2b39818fb77a7d9d608386f9d17285
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-16 09:00:37 +00:00
Leena Miettinen
fee82ed2c2 Doc: Restructure the Wireframing chapter
Renamed from "Creating UIs"

Fixes: QDS-4469
Change-Id: Iabf436a7ed9aa87c144c29fbe39d4d5923a29ae7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-06-16 08:12:57 +00:00
hjk
cf8a05fbec CMake: Use FilePath in FileApi{Reader,Parser}
Helps docker.

Change-Id: I2e1eba61be983340260211bbee6c1bab8a59f883
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-16 07:21:08 +00:00
Tim Blechmann
8ec23e44a2 cmake: fix Qt6Core5Compat detection
Change-Id: I6de4de1f20b4e611f632ee515cfdf5243f2d16ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-16 07:05:16 +00:00
Thomas Hartmann
2b91593ea8 QmlDesigner: Show StackLayout
The minor version requirement creates issues with the 6.0 import.

Task-number: QDS-4569
Change-Id: I6fc88a499fd9870963ff8ec4a05d3fe4156c2133
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-15 17:04:08 +00:00
Thomas Hartmann
1f8f1d620f StudioWelcome: Use custom scroll bars
The default style on Windows with Qt 6 does not fit.

Change-Id: I9e0a8ad411a28744a333b768c493248aa5a1c9db
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-15 16:17:49 +00:00
Thomas Hartmann
f62d3c7266 StudioWelcome: Remove effect from splash screen
Not supported with Qt 6.

Change-Id: Ie12c5b15caaa6b80dcb3dc26fdf43b360b6761a5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-15 16:17:39 +00:00
Thomas Hartmann
7445386581 StudioWelcome: Do not use TitilliumWeb on Windows
TitilliumWeb creates issues with Qt 6 on Windows.

Task-number: QDS-4539
Change-Id: I70782cc7399622e851b01ed997d1919b624fce3b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-15 16:16:38 +00:00
Christian Stenger
cb024acdaf AutoTest: Give at least minor hint about ctest failures
When running ctest we get by default only the output of ctest
without any "real" test output. Finding the respective issue
especially in bigger test applications is impossible without
re-running the test manually.
So, turn on output on failure for running ctest as long there
is no settings page for ctest.

Change-Id: I9a6468d0d43173bfcb2b140c96301449840d9517
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-15 15:41:13 +00:00
Eike Ziller
fa6490efbc CMake: Avoid iterating project tree for each build target
Reduces lock-up in main thread after loading projects

Task-number: QTCREATORBUG-25783
Change-Id: Ie769074f1689698379bd6fd60f74957086cfce37
Reviewed-by: hjk <hjk@qt.io>
2021-06-15 13:51:04 +00:00
David Schulz
439bb9c4ae LanguageClient: manually track document version
Using the document revision causes issues for some servers.

Task-number: QTCREATORBUG-25766
Change-Id: Ic858e19c6fe39e57c9d3124913887aafee0a3cd0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-15 13:01:05 +00:00
Miikka Heikkinen
200723cf13 QmlDesigner: Fix pasting 3D nodes
Pasting multiple 3D nodes are now pasted in correct scope instead of
always pasting under scene root.

Fixes: QDS-4534
Change-Id: I233bf360e2bd335c952b1e727a9ee775d2cdd23a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-15 12:35:16 +00:00
Eike Ziller
65870f804b COIN: Add deployment target for macOS
Minimum deployment target for Qt 6 is 10.14

Change-Id: If85f34d89a39b92eedc42b0ff9a581264917a589
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2021-06-15 12:17:40 +00:00
Eike Ziller
58db5d5e71 COIN: Remove unused LLVM environment variable
We are passing it explicitly to the build script and don't use the
provisioned version anyhow.

Change-Id: Id136e06023621389763eeeda021fa64551a148a3
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2021-06-15 12:17:32 +00:00
Eike Ziller
089802cabd Remove documentation on ClangRefactoring plugin
Change-Id: I33ba1da6eafda1827b54e8ed55de95e1d35a5b8e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-06-15 11:33:58 +00:00