Commit Graph

72385 Commits

Author SHA1 Message Date
Alessandro Portale
71af551dea ProjectExplorer: Fix project paths from welcome screen
Don't puto wrong delimiters into FilrPath. They create multitudes of
problems down the road.

Change-Id: I7a95494c0f59416b7468636b3786d7efdbbdf14e
Reviewed-by: hjk <hjk@qt.io>
2021-09-21 10:58:09 +00:00
Eike Ziller
04bb1ee5da Fix QtProjectImporter test for Qt 6.2 versions in PATH
In Qt 5, qmake is statically linked to the bootstrap library,
so just copying qmake somewhere results in a runnable executable.

In Qt 6 this changed, and qmake depends on the dynamic QtCore
library, and on Linux also on ICU. Copy these in addition to
the qmake executable. Keep the directory structure as in Qt, so
the dynamic linker finds them.

Change-Id: Ie4f6b617bc91d847b1e4fe38dc8a1c603eae4087
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-21 09:26:07 +00:00
Eike Ziller
56d346018a Acknowledgments: Fix path to cpluscplus lib
Change-Id: Id1a2f9797bff6b07d75d40c3ce5e6541aeea585e
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-09-21 07:35:30 +00:00
Assam Boudjelthia
7bf268114d Fix issue with deploy step not getting valid abi with CMake
With CMake, it seems that the abi was being empty string because
looking for ANDROID_ABIS is not defined and instead there's ANDROID_ABI.

Also make sure to handle the case of ANDROID_ABIS, which might be
declared in future versions like Qt 6.3 which can support multi-abi
builds.

Change-Id: I805c5c25409a4e20a237b8747082d256bd72e275
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-21 06:07:41 +00:00
Christian Stenger
c141b0d8f9 AutoTest: Support some ctest settings
Add some useful settings for ctest based testing. Adapt output
parser accordingly to get at least relevant output and display
significant information inside the visual display.
Current implementation loses or mixes some information when
running jobs in parallel.
Complete output is still available inside the text display.

Fixes: QTCREATORBUG-26029
Change-Id: Id040f83900a6cfd89f5c2aff987278a297aa14c4
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-21 04:31:34 +00:00
Marco Bubke
e7de332f2b QmlDesigner: Fix uninitialized variables
It shows very well why only one variable per statement should be
initialized.

Change-Id: I4bef73066583998be545c8930b3f9cbea5bc4e4b
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-20 14:51:36 +00:00
Kai Köhne
96ba15dc3a MSVC: Fix C4996 in sqlite3.c
Fixes warnings
  sqlite3.c:43154: warning: C4996: 'GetVersionExA': was declared deprecated
  sqlite3.c:43164: warning: C4996: 'GetVersionExW': was declared deprecated

We know that we're running on Windows NT based versions (the default), so
we can as well skip this check.

Change-Id: Idd7db098645060bf8b9e449e59904f2f63fb0e0a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-20 14:13:46 +00:00
Alessandro Portale
58a9b1e396 Android: Use fromUserInput on paths with potential native separators
Otherwise functions like FilePath::fileName() don't work.

amends: 2d019ed659

Change-Id: Id606cabe77a46dab07d3f8c3f38e852517782176
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-09-20 14:01:30 +00:00
Eike Ziller
29df497d25 Add text search functionality to output window centrally
All output windows should be searchable with Edit > Find/Replace
(Ctrl+F), no reason for every single instance setting that up
individually.

Add a find placeholder for the build system output in Projects mode, so
the search functionality is available there as well.

Change-Id: Idad6824bfb21e6ae9ab923191a7e83b43256e68b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-20 13:58:45 +00:00
Cristian Adam
b7ad67ccdf GitHub Actions: Fix tag release upload of artifacts
runner.os for uploading of artifacts is always ubuntu, and therefore
the runner.os comparisons were not working as expected.

Change-Id: I9e2bb418d4fee47aaf57a096a23cbd554051d1df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-20 12:48:36 +00:00
Cristian Adam
3c41665b80 GitHub Actions: Do not build with tests on release tags
This should match the official releases.

Change-Id: I075e977121ffcaa32de37a9505be6c6296d7258d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-20 12:38:14 +00:00
The Qt Project
9815d2ee7e Merge "Merge remote-tracking branch 'origin/5.0'" 2021-09-20 11:51:42 +00:00
Eike Ziller
6a99368979 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/utils/processreaper.cpp
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/cmakeprojectmanager/cmakeprocess.cpp

Change-Id: I353a445b5862f63362ea954749b5565360951283
2021-09-20 13:43:20 +02:00
Christian Kandeler
7e378513c1 Make some headers self-contained
This fixes the build in certain configurations, e.g. MSVC + qbs + Qt 6.

Change-Id: Ia72dfd6dcfe1d1ecc08c40a3af6e60a935dc355f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-20 10:14:14 +00:00
Artem Sokolovskii
feb7b011df Wizard: remove .ui files
Task-number: QTCREATORBUG-26277
Change-Id: I2ec4dd241f4c3f6c2b4ecae832ca7b608b86fc35
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-09-20 09:04:01 +00:00
Christian Kandeler
002d0a97aa ClangCodeModel: Add XFAIL-ing test for clangd completion
Change-Id: Ic8672d5ce14b9a8d86dc511c5aa3289037258d64
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-20 08:26:57 +00:00
Marco Bubke
728be60986 QmlDesigner: Change import export architecture
The new architecture should be a better abstractions for qml.
ImportedTypeNames are introduced. ModuleDependencies are now taken
over by document imports. Modules lost their version and
ExportedTypeNames gained it.

Task-number: QDS-4938
Task-number: QDS-4933
Task-number: QDS-5009
Task-number: QDS-5032
Change-Id: Ia86921c5be9107fe7d5bfd28f12bf8453769dc10
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-20 07:29:22 +00:00
Marco Bubke
13aaea197b QmlDesigner: Rename Import into Module
Task-number: QDS-4933
Change-Id: Ibc28ae731ffb27734f61eb438230fa58fe800bdc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-20 07:29:15 +00:00
Marco Bubke
a570d53db2 QmlDesigner: Add ProjectStorageUpdater
Adding a skeleton for the ProjectStorageUpdater.

Task-number: QDS-4819
Task-number: QDS-4793
Change-Id: I230d68f71480d360d71019883510ef22dd276802
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-20 07:28:59 +00:00
Eike Ziller
24e3cb3ab9 COIN: Use Qt 6.2.0 RC
Change-Id: Ic995d0b139de4c3203c8ad9672c46ac8edd5a4b1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-20 06:14:37 +00:00
Ivan Komissarov
0032f0ec85 Update Qbs submodule to the top of 1.20 branch
Change-Id: I1b00b572cb009b9b43fe505659fe6821665e46fe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-17 14:32:51 +00:00
David Schulz
cb5eaf4a63 Clangd: remove unused member
Change-Id: Idd95245a6c5b0db37ca30966cb509fc75a4901e3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-17 12:44:22 +00:00
Eike Ziller
8fa353bb30 Bump version to 5.0.2
Change-Id: Ia919fb9c976025000609033ed61ecb1c2fe71f7a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-17 12:23:30 +00:00
Leena Miettinen
b32728b99f Doc: Update Stack Layout screenshot
To display the new Properties view.

Task-number: QDS-4561
Change-Id: Icc297441439013e094a1325102e6651f34789bd4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-17 12:09:24 +00:00
David Schulz
07cfae77ba Clangd: fix opening document with client for project
Using LanguageClientManager::openDocumentWithClient function to assign a
document to a specific server. This function also takes care of
deactivating the document for the old client and opens it if necessary
in the new client.

Fixes: QTCREATORBUG-26205
Change-Id: Idbff154a62d12c432a2cb10d547f78a537e63a3c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-17 12:00:32 +00:00
David Schulz
17b05bc3e8 Clangd: Create correct code assist processor in provider
... for the context of the code assist instead of using a callback from
the text editor.

Change-Id: I636b1b267a944895d4ff732e3c0a8811332ec14f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-17 12:00:18 +00:00
David Schulz
6bbbaca696 LanguageClient: export FunctionHint code assist
Change-Id: I57a819b11bb2eb44662c98862643146a686a8c06
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-17 11:59:56 +00:00
Thomas Hartmann
e58116169a StudioWelcome: Register help for qtquick3d
Change-Id: I6b5b8da97299341b262d09307a2adb03f7219b83
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-09-17 11:44:18 +00:00
Artem Sokolovskii
2d22dbe612 Android: Use FilePath
Change-Id: Ia1cf2a615f0de70038a575f851572e944a9797df
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-17 11:37:35 +00:00
Artem Sokolovskii
905325358a FilePath: Add bool to lambda iterateDirectory
Change-Id: I017426a48981da2fbeb32b6d5bee87865d583c0b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-17 11:37:24 +00:00
Cristian Adam
67b8e8f9b1 Reaper: do not disconnect process before reaping
AbstractProcessStep is relying on signals which breaks with
the disconnect call.

Amends ebae255e49

Fixes: QTCREATORBUG-26271
Change-Id: I16ebaad68352be5c41492e5c4d4fbc3f032e2e39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-17 10:26:16 +00:00
Henning Gruendl
8755b2336f QmlDesigner: Fix states list button icon alignment
* Fix button icon alignment after collapse and expand
* Fix parameter injection warning in StatesList

Task-number: QDS-5054
Change-Id: If842e48c15485f79b6515e781139dfb07cd6fa07
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-17 10:00:53 +00:00
Cristian Adam
69475d37fe CMakePM: Populate targets list on add new build step
The target list was recreated when the parsing of CMake project
finished.

But for already configured projects, the list was not used when
a new build step was added. This new step will only get the
targets list when the CMake project would be reparsed.

Fixes: QTCREATORBUG-25759
Change-Id: I54d12a71dacf9fcec2ad0f3e341fe8057880251d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
(cherry picked from commit a88f1426c3)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-17 09:16:30 +00:00
Cristian Adam
845230166b CMakePM: Allow loading of projects that do not have any targets
Fixes: QTCREATORBUG-25509
Change-Id: I4e56576f0d9fdffa50c81f4901fb30d17952553e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
(cherry picked from commit 86825283ed)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-17 09:16:12 +00:00
Eike Ziller
118883f66a qmake: Fix crash with Qt 6 when canceling parsing
In Qt 5, QFutureWatcher::isFinished was only true if the finished signal
was already sent. That changed in Qt 6, where it represents the state of
the QFuture instead. Use an explicit bool for representing "finished
signal was sent" instead.

Task-number: QTCREATORBUG-24098
Change-Id: I4dd8e1c7f6659b2856634d522fb1c0f7eef6741b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-17 09:10:50 +00:00
Leena Miettinen
9aa3a20c16 Doc: Update info about custom control wizards
- Update GIF images, because some of them were looping and some not
- Also, the Custom Button styling has changed
- Add note about how to disable misbehaving hover effects

Change-Id: If8ad75d734ab2a8b87359122c041fbbdcfe00b8a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-17 08:57:43 +00:00
Leena Miettinen
b1e67bc230 Doc: Update screenshots
Fixes: QDS-4561
Change-Id: Ie70227cd6873d603e2049e31aadfd43e66d9bdbd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-17 08:57:32 +00:00
Christian Kandeler
56f9d17d35 ClangCodeModel: Fix an instance of mis-highlighting with clangd
In the expression x.f(), x was wrongly categorized as an output
parameter if f was a static function.

Change-Id: I9167f98916963cdaa4b5ac6ead2c86fab43ad02e
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-17 08:48:52 +00:00
Christian Kandeler
b771bdf4c1 ProjectExplorer: Add a cancel option to the rename dialog
... in the project tree.
Also properly handle the situation where the dialog is closed by other
means than one of the buttons.

Task-number: QTCREATORBUG-26268
Change-Id: Ic0b613be2413f96355c1b33bb4753bd1170e0671
Reviewed-by: hjk <hjk@qt.io>
2021-09-17 08:47:58 +00:00
Christian Kandeler
b74b5a3ee6 ProjectExplorer: Do not list files more than once in the rename dialog
... for project tree entries. The same file can occur more than once in
the tree.

Task-number: QTCREATORBUG-26268
Change-Id: I8af1e3a73d54e5a54c858fb3f7a8cf4afa83c7e2
Reviewed-by: hjk <hjk@qt.io>
2021-09-17 08:47:36 +00:00
Christian Kandeler
fc35635942 LanguageClient: Fix possbible crash in inspector
... when clearing.

Change-Id: Iadb57c07562fab77a65bcad38cf509dd1af6c0c3
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-17 08:47:02 +00:00
Alessandro Portale
1638c337c1 Welcome: Remove spacing between the link buttons on Welcome screen
The 5-pixel spacing causes the sensation of flickering while hovering
over the buttons. Other elements on the welcome screen (recent projectsm
sessions, etc.) don't have spacing, and therefore, the hovering feels
"smoother".

This change removes the spacing and compensates that by increasing the
link height accordingly.

Fixes: QTCREATORBUG-26275
Change-Id: I0159d65d941971c169faf2f156cd4f8c0ddd365c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-09-17 08:45:13 +00:00
Leena Miettinen
9283f74bed Doc: Update screenshots about custom properties
Add an example of where custom properties should be used.

Task-number: QDS-4561
Change-Id: Idf99f63bc4c4a04b8b7912c98f15274ec7544b10
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-17 08:42:03 +00:00
hjk
6c4c310278 Debugger: Expand Variables in Debugging Helper Customization
Fixes: QTCREATORBUG-26261
Change-Id: Ie034e3b170bad2ccd4aaa4c004c8eeeebeeaff87
Reviewed-by: Karsten Sperling Opdal <karsten.s.opdal@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2021-09-17 05:54:31 +00:00
Cristian Adam
86825283ed CMakePM: Allow loading of projects that do not have any targets
Fixes: QTCREATORBUG-25509
Change-Id: I4e56576f0d9fdffa50c81f4901fb30d17952553e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-16 17:35:18 +00:00
Cristian Adam
a88f1426c3 CMakePM: Populate targets list on add new build step
The target list was recreated when the parsing of CMake project
finished.

But for already configured projects, the list was not used when
a new build step was added. This new step will only get the
targets list when the CMake project would be reparsed.

Fixes: QTCREATORBUG-25759
Change-Id: I54d12a71dacf9fcec2ad0f3e341fe8057880251d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-16 16:35:55 +00:00
Leena Miettinen
0efe414100 Doc: Update fourth part of entry-level tutorial
Task-number: QDS-5001
Change-Id: Iab790f9141424ef848ddeaa2566108bf7a75d18a
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-16 14:36:49 +00:00
Christian Stenger
49c8471ef2 ClangTools: Adjust test files
Qt6 handles multimedia and multimediawidgets as add-on modules,
so they get installed only if explicitly checked while installing.
Make them optional for testing Qt6 as well.

Change-Id: I33b0686a61bf20ace790aa0c2bc27a5219d30aac
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-16 14:28:55 +00:00
Leena Miettinen
d8c1dfc789 Doc: Update third part of entry-level tutorial
Task-number: QDS-5001
Change-Id: Id1c8dc919f09846a3e7d7b257e9b974f9eeecbda
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
2021-09-16 14:17:11 +00:00
Leena Miettinen
40cfd78435 Doc: Update the second part of entry level tutorial
Task-number: QDS-5001
Change-Id: If171a47c5aee4c8e6f5622e8217cc137de7bb6bb
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
2021-09-16 14:16:27 +00:00