Commit Graph

69993 Commits

Author SHA1 Message Date
Bernhard Beschow
116db82720 Fix qmake build
Ammends commit 770d87709e.

Change-Id: I5dc0d4ca821a7da8c8a14a56ce4f885176314be0
Reviewed-by: hjk <hjk@qt.io>
2021-06-24 07:08:05 +00:00
Eike Ziller
dda115d0d8 Merge remote-tracking branch 'origin/master' into 5.0
Change-Id: I3f9049ec34c9b3be42bd0d1fd8aa1d14f8014fe2
2021-06-24 08:40:54 +02:00
Wojciech Smigaj
194569b471 ProjectTree: Add an option to hide Source and Headers file groups
A new checkbox "Show Source and Header Groups" is added to
the filter menu in the project tree. It is checked by default.

Unchecking it removes the extra level of virtual folders containing
sources and headers.

Change-Id: I25f4514e7f1f6cdfcb531a911e54cc6e7e42a3e2
Fixes: QTCREATORBUG-25313
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-24 05:24:26 +00:00
Ivan Komissarov
afa4218871 Update Qbs submodule to the top of 1.19 branch
Change-Id: I79385eb5d49c46a4e856682f3be43c954ca26717
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-06-23 20:08:34 +00:00
Eike Ziller
2e4d57db35 Fix that disabled QRC files were enabled by QRC expansion
The automatic expansion of QRC files to the tree of their contents
didn't preserve the "enabled" property of the original QRC node.
For CMake projects that resulted in the file system tree still being
shown, with only the QRC nodes, when "Hide Disabled Files" was on,
instead of hiding the file system tree completely.

Change-Id: If1eb88478955dc8635def844cfc501befcbfc329
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-23 18:37:35 +00:00
Cristian Adam
913dc9549e CMakePM: Do not expand qrc files for <File System>
The qrc file expansion could take time and it's not a
great idea to do it for all files in the filesystem.

Amends 53115259ba

Task-number: QTCREATORBUG-25783
Change-Id: I10b1f6c224e78b0efe4654bcf36d7cb9ba0e7e5f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-23 18:37:21 +00:00
Kai Köhne
10420d4e5e Replace Freenode with Libera.Chat
Change-Id: Ia4a54b72f522a02c734273630c8217af75e4ea92
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-06-23 14:40:50 +00:00
Eike Ziller
0bcab32657 Avoid expanding QRC nodes in main thread
For CMake and Qbs projects and users of TreeScanner, where the tree is
already created in a separate thread.

Expanding the QRC nodes means reading and parsing the QRC files, which
can take up a considerable time (second(s)) if there are hundreds of
them in a larger project like Qt Creator.

Task-number: QTCREATORBUG-25783
Change-Id: I5ca818b9f75ea6e8ef23f837cc9e15df7e6630e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-23 14:27:44 +00:00
Eike Ziller
9109a6895e CMake: Do not create file system node in main thread
The file system scanning was already in a thread, but creating a tree
from the flat list of file nodes was still done in the main thread.
Creating the tree looks for and creates folder nodes as needed for each
file node, which is not that big of a deal but still takes 1/3 of a
second for the Qt Creator source tree.

Task-number: QTCREATORBUG-25783
Change-Id: I28948ed3ff5233f6fc4b86e93da94d882b81e231
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-23 14:25:08 +00:00
Jarek Kobus
fd6ec7da25 Remove unused ModelManagerInterface:isIdle()
Change-Id: I7c607bcc0a03219d7d6205a0c5fbdd3d46f9e9fa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-23 14:01:50 +00:00
hjk
95496a7d8c QtSupport: Fall back to local paths in ProParser
That's conceptually wrong, but the only thing we can do until
the ProParser can operate remotely.

Change-Id: I9e5cad6241239b4df45c44538dbb0f56c56d5e57
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-23 12:14:07 +00:00
Leena Miettinen
00d1a03b09 Doc: Update info on installing QDS components and Qt Quick Timeline
Link to the subsections with more information.

Change-Id: Id139ef10cd30693b5685a94af13906f99e8bde5d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-23 12:09:49 +00:00
Eike Ziller
1d600101ee CMake: Apply build directory change on editingFinished
Otherwise every time a character is typed, a dialog pops up, and that
dialog is closed without triggering a cmake run, the value is reset.

Add that behavior optionally to StringAspect.

Change-Id: I6831d1622f08acae6df43d4ceb2bf7367c96a747
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-23 12:05:45 +00:00
David Schulz
e13c2b7403 MimeDatabase: add FilePath convenience function
Change-Id: I59c825490b3b5c49f3c177584ea4cc885c4f920b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-23 12:03:28 +00:00
David Schulz
b6367b6359 Core: use FilePaths to notify files changed internally
Change-Id: I2fce65ad340f18292fc0286233e78aaf769a130d
Reviewed-by: hjk <hjk@qt.io>
2021-06-23 12:03:10 +00:00
hjk
1955c82d5c Debugger: Register "Reload Debugging Helper" action
This allows assigning shortcuts via Tools->Options, Environment,
Keyboard Shortcuts

Fixes: QTCREATORBUG-25900
Change-Id: I6dfa6b0f3ff12ad971444b2d3adb427c8acf783c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-23 11:48:03 +00:00
hjk
10af72100d Core: Update contact from freenode to libera.chat
Change-Id: Ia5dff84029dd7011ddc370e1493d02bafd41b9e2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-23 11:45:07 +00:00
Knud Dollereder
a31261fa14 Fix license header of the eventlist plugin
Change-Id: Ib8f966557a69ded0f345478e2b003b90f76fb7d5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-06-23 10:11:49 +00:00
hjk
55f3d566a0 Debugger: Use more sensible import defaults for personaltypes.py
Fixes: QTCREATORBUG-25898
Change-Id: I6fbaaf0c219299ff157446376959e305693a9902
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-23 09:52:17 +00:00
hjk
c12e48ea36 ProjectExplorer: Allow gcc autodetection on docker devices
This uses a separate branch for the remote detection and leaves the
local development host path untouched.

Ideally the code should be identical, but currently the environment
handling on remote devices is not on par with the local cases, yet
good enough to find normal gcc installations.

Change-Id: I6762299d8ddfdf2aceb0d57cc77ab71fcc83788b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-06-23 08:51:24 +00:00
Mahmoud Badri
95a3ce7e25 QmlDesigner: Add assets to navigator in 1 transaction
...so only 1 undo step is created when dragging multiple assets to
navigator.

Change-Id: Ifa812eada5ce56a51e164d80864c3826f9875caf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-23 08:49:22 +00:00
Miikka Heikkinen
1c44dab5af QmlPuppet: Render 2D content inside 3D edit view
In order to render embedded 2D items in 3D scenes or 2D items used
as 3D material textures, those 2D items must be rendered.
2D content is now rendered when necessary also in editor puppet.

Fixes: QDS-4471
Change-Id: I83da90198ecebc3a3a9a35aab28f4aec36620492
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-06-23 08:44:47 +00:00
Mahmoud Badri
95e82882ef QmlDesigner: Fix showing assets on first add to a project
Fixes: QDS-4599
Change-Id: Idf2ec32adc490d9dbfc8c3ddc3b43cbf965d3b76
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-23 08:43:18 +00:00
hjk
430e81facd All: Replace most SynchronousProcess by QtcProcess
Change-Id: I0bf22fef2cd4a7297ef5a1e9aa9c3e2b9348ba42
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-23 07:55:31 +00:00
hjk
8ac67dd1b7 QMake: Use local paths in interfacing ProFileReader
There are some internal hard asserts on that.

Change-Id: I93bbdff0c9625d42d5f9da3f12219ad90c478d5d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-23 06:52:34 +00:00
hjk
953ea730b8 Utils: Merge QtcProcess and SynchronousProcess
Keep SynchronousProcess as type alias for a transition period.

Change-Id: I2540b6cecc17eb46f40ed57d27589011693728f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-23 06:31:57 +00:00
Eike Ziller
cfabd8483b Add changes file for Qt Creator 5
Change-Id: Id37f6eb06a4219bfa450ee6ec34b31274c6e8cb5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-06-23 06:30:58 +00:00
David Schulz
6902ddc535 Utils: add FilePath::isWritableFile
Change-Id: Ic6ced87fcee92deadf5a117ea7e987f1c877f83a
Reviewed-by: hjk <hjk@qt.io>
2021-06-23 06:21:46 +00:00
hjk
8e40db5580 Python: Fix setting current interpreter
There was a vicious cycle started when loading a runconfig pointing
to an interpreter with an id that was not present in the combobox.

Amends 9decfcb151.

Change-Id: I77595795eb825bde55919c8d8dd632f3bf397578
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-23 05:59:59 +00:00
David Schulz
ddf323b136 LanguageClient: remove unused document check
Amends 439bb9c4ae

Change-Id: I783b5f099ffdce2a714f1007e7cc50cda6e211a0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-23 05:17:42 +00:00
Cristian Adam
a72494182b QNX: Do not set application arguments to pdebug
This way one can give application arguments to the application to be
debugged on QNX.

pdebug doesn't need the application arguments to be forwarded.

Change-Id: I76d1bf0dcd9c8fd085245142239e427d9dcb711e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-22 16:30:21 +00:00
Henning Gruendl
f29591aa4a QmlDesigner: Fix splashscreen dof effect
* Remove random character

Change-Id: I88a8046df6994b1db520e2da0ba89641b1b59365
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-22 14:12:32 +00:00
Henning Gruendl
66cd1a41c9 QmlDesigner: PropertyEditor redesign
* Add responsive resizing for property editor width
* Adapt custom component templates
* Fix custom component template generation if no properties defined
* Adapt Animation specifics and sections
* Adapt HelperWidgets specifics and sections
* Update ColorEditor and its components
* Remove SimpleColorPalette and its components
* Add ColorPaletteSingleton
* Implement eye dropper for ColorEditor
* Add TextExtrasSection and FontExtrasSection
* Move Component section to a new file
* Remove Advanced tab make its content a section
* Redesign TabBar and TabButton
* Make QtQuick.Controls 2 specifics part of QtCreator repository for now
* Update import versions
* Add new constants
* Update icon font
* Fix/update StudioControls and HelperWidgets
* Fix a few undefined warnings

Task-number: QDS-4582
Task-number: QDS-4562
Task-number: QDS-4555
Task-number: QDS-4554
Task-number: QDS-4553
Task-number: QDS-4299
Task-number: QDS-4296
Task-number: QDS-3769
Change-Id: Ia9677fd97f26e0e31a45da7a4136db1c9e1a5bf2
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-06-22 14:08:30 +00:00
hjk
32895873e4 Utils: Move remaining SynchrounousProcess functionality
To QtcProcess, as penultimate step to fully merge the two.

Change-Id: Iaab3bc3e50165f732838335bd185632f33a97900
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-22 13:12:04 +00:00
Tim Jenssen
a803d04c17 fix Qt6.2 builds
use foreach to be prepared for the future

Change-Id: I9157bb04479ff2376a567380c76c38b9aee900b7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-22 13:02:11 +00:00
Jarek Kobus
5b0889777a Add a test for a crash in ModelManagerInterface
Task-number: QTCREATORBUG-25350
Change-Id: I4ea31e7936cc77dcd8f3fc494b5ecbd83858a766
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-22 12:42:53 +00:00
Leena Miettinen
7e874544e6 Doc: Remove incorrect info about synchronizing project tree with editor
Fixes: QTCREATORBUG-25893
Change-Id: I1b5e4da53b70732d317a0786926e12ab3c81b7e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-22 12:36:15 +00:00
Christian Stenger
0e57baf784 Docker: Raise number of iterations when starting container
On Windows this call takes way longer to write to the cidfile.
Beside this, read only from file if it could be opened to
silence some Qt internal warnings.

Change-Id: Iec5f631aaf871995c1903289d7a0a24abc2f8e05
Reviewed-by: hjk <hjk@qt.io>
2021-06-22 12:07:20 +00:00
Alessandro Portale
a56ce4e450 Tracing: Add qml, register types via qt_add_qml_module
Use the CMake-based qml API to create the "QtCreator.Tracing" module.
This uses qt_add_qml_module, which was introduced with Qt 6.2.

For Qt 6.1 and below, everything compiles and runs like before this
change.

Change-Id: I4d63f9f724d0628cfaab9d1164c0d575f15d15aa
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-06-22 11:58:05 +00:00
David Schulz
693d54a069 Editor: check highlighter for comment chars before auto fold
The KSyntaxHighlighter Definitions provide single and multiline comment
markers. So check against those when trying to automatically fold the
first license header instead of assuming that '#' and "/*" are comment
markers.

Task-number: QTCREATORBUG-25882
Change-Id: I3a84cfc45445caad3b40feb996cfb781a5fb3190
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-22 11:52:52 +00:00
Knud Dollereder
1a402984da Make the eventlisplugin a part of the qmldesigner plugin
The eventlistplugin enables the user to create custom events (QDS-1760).
It provides a dialog to create and remove a custom event or modify its
properties (id, description, shortcut) and a dialog to connect an
event to one of the flowsignals in order to trigger a transition or
a state change.

Task-number: QDS-4300
Change-Id: Ifffa81650d4898b34a65d7901bcb0df95cc397af
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-06-22 11:36:32 +00:00
Johanna Vanhatapio
0c766cf3c5 Doc: Add more content to FAQ
Change-Id: Ia3b475bd02116f0c8d9cc778ab270603b802dab4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-06-22 10:45:59 +00:00
hjk
c721242be8 Docker: Automatically remove the container when it exits
Change-Id: I167dfadc79e892807f47332f79f2a5226ffdbe1a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-22 10:34:27 +00:00
Eike Ziller
4290c26414 CMake build: Force optimization of CPlusPlus lib
Even in the debug build, as done for the qmake build system. This is for
performance optimization of this critical part for C++ parsing even in
debug / developer builds.

Change-Id: I9552ba9fc44e213f2df1d2d2a64a126af3603fd1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-22 10:10:14 +00:00
hjk
98b9c36270 Autotest: Drop one use of Runnable::device
Change-Id: I9830af1a5a558d9df64aff2a9e12a803720f2ab7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-22 09:53:08 +00:00
Tuomo Pelkonen
69e18d7917 Qmldesigner : Fix crash when component is added while editing inline delegate
This is only fixing the crash but does not adding the import

Task-number: QDS-4602
Change-Id: Iacb449d5342fcfdd5daf21abcec668569380ddba
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-22 09:41:08 +00:00
Leena Miettinen
d41d523d7b Doc: Describe file properties added to File Properties dialog
Task-number: QTCREATORBUG-25642
Change-Id: I4901e65e16fddac864cabfded1e3ef9d3d35881b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-06-22 09:25:36 +00:00
The Qt Project
7dd3521d77 Merge "Merge remote-tracking branch 'origin/4.15'" 2021-06-22 09:23:00 +00:00
hjk
60ab92ec1b CMake: Use line based QtcProcess callbacks in CMakeProcess
This also fixes a potential issue where contents in the local
'rest' strings outlive the process and get part of the next run.

Change-Id: Ia9272bff80213084e430436d677183b4faabd250
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-06-22 08:57:42 +00:00
hjk
c0fe038f93 Utils: Simplify FilePath::toFileInfo().lastModified() calls
It's the same as FilePath::lastModified locally, and toFileInfo
doesn't work remotely. So it's overall at least not worse.

Change-Id: Ice8d80dcfd01dc38edc1dce2b53e1b5e6274380f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-06-22 08:57:28 +00:00