Commit Graph

47434 Commits

Author SHA1 Message Date
Henning Gruendl
513d1e7e02 QmlDesigner: Improve connection editor dialog
* Add ComboBoxes to connection editor dialog
* Add type toggle to dialog
* Add slots and properties to ComboBoxes
* Parse connection expression and fill ComboBoxes

Task-number: QDS-2498
Task-number: QDS-2495
Task-number: QDS-2496
Change-Id: I2cca6d4c85d1508e54d4ad8863056f22ad777ae6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 10:14:56 +00:00
Marco Bubke
7c8847333b QmlDesigner: Go into components
Task-nubmer: QDS-2696
Change-Id: I2f0ee71deea593da08fa4a754d783b53867473ed
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 08:37:53 +00:00
David Schulz
af88afe943 Debugger: Activate split that contains the breakpoint being hit
Do not change the current editor after hitting a breakpoint if we
already have an editor open in another split, but switch the focus to
that split.

Task-number: QTCREATORBUG-24646
Change-Id: Id85cecdfb522807bafa097e578509853326a2e31
Reviewed-by: hjk <hjk@qt.io>
2020-09-16 07:29:30 +00:00
David Schulz
e371eafd4b Editor: Calculate annotation color based on editor color scheme
Amends 9182d4eda7

Fixes: QTCREATORBUG-24644
Change-Id: Id34bfbc4ea3d1102835c7c1cf3afa1580dff01d8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-16 07:20:20 +00:00
Miikka Heikkinen
90d9cb36f3 QmlDesigner: Add navigator preview tooltip for materials
Request 3D preview image for material instances from puppet
to show on tooltip.

Support for effect previews is also done, but handler for it is not
registered, as effects cannot be shared between windows due to
issue QTBUG-86616.

Also refactored the preview image support out of navigator
to make it more accessible by other components.

Change-Id: Ie08ba218f929660c2e43d39578997a5a1a883efd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 07:00:06 +00:00
Christian Stenger
f849bd1105 AutoTest: Support run failed
If the last run had failures and the test frameworks
support matching a test result to a test tree item
give the user an easy way to re-run all failed tests.

Change-Id: I4f3150ca8a6514c09cf7ca819f84e38c6419a310
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-16 06:54:02 +00:00
Christian Stenger
5f22126a79 AutoTest: Support gathering failed tests
Mark test tree items as failed for the last run
to be able to re-run them in an easier way.

Change-Id: I7ea3dcd16e5a02797d41f13e02b2fa95b857cf5e
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-16 06:53:54 +00:00
Christian Stenger
b4987f8fc9 AutoTest: Fix compile on UNIX
Change-Id: I658fc0cf9ec0ec3dfd24bcd53e0a01c29989ea9c
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-09-16 04:26:35 +00:00
Eike Ziller
6f596ea5ee CppTools: Fix Qt6 build wrt internal QString changes
Task-number: QTCREATORBUG-24098

Change-Id: Ic1f72365a696993b3e81e9600b3b89d75d5e8bc4
Reviewed-by: hjk <hjk@qt.io>
2020-09-15 13:57:41 +00:00
Eike Ziller
242579099a CppTools: Fix QStringRef and QSharedPointer related issues with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I97347ac3fb397fea8eee655e3cc4ee252c511885
Reviewed-by: hjk <hjk@qt.io>
2020-09-15 13:57:32 +00:00
Christian Stenger
745beb7634 AutoTest: Fix possible nullptr access
If the process of the test executable cannot be started
for whatever reason we will not have an active run
configuration or output reader.

Change-Id: I50146a2c8228ad39574e007ae2659465122ad20b
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-15 12:59:05 +00:00
Christian Stenger
400b39530b AutoTest: Enhance run and debug from results pane
So far, only Qt and Google test had support for triggering a
run or debug of a corresponding test case given by a test
result. Add the same support for Boost and Catch as well.

Change-Id: I45a4416f32be22f40b7e14dfb6c08bda310a9eb3
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-15 12:01:15 +00:00
Christian Stenger
7ca297cb25 CppEditor: Fix test code
Change-Id: I01073f481ebdae64c30971afd8fb332ee92e2a1e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-15 12:00:53 +00:00
Knud Dollereder
f4a2e0a5d3 Disable "insert keyframe" context menu when applicable
Fixes: QDS-2727
Change-Id: I0072e77e56f6bbb893e382fbeb39861d2d5e6a61
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-15 10:58:23 +00:00
David Schulz
116fb0895d LSP: move diagnostic handling from client in a separate class
Change-Id: Id70a7b82137d3a4591de521380199e546e8685f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-15 10:45:49 +00:00
Christian Kandeler
f3bd07efd1 QmakeProjectManager: Restore incremental re-parsing
This was broken in commit 37aecdd112, where we overlooked that a special
type of IDocument was used that triggers a re-parse of only the affected
part of the project tree. As a result, all changes to a .pri or .pro file
would trigger a re-parse of the entire project.

Fixes: QTCREATORBUG-24572
Change-Id: I480cff4e53cf86a17e1eaac0eb9b32901bc87051
Reviewed-by: hjk <hjk@qt.io>
2020-09-15 09:19:23 +00:00
Alessandro Portale
a159af342e Android: Remove unused functions
As found by Cppcheck

Change-Id: I9274fe45ed49099b52b4f8556508ec0adc676386
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-09-15 08:56:55 +00:00
hjk
0d6409c20c Android: Fix use of commandline arguments to build apk
After 69ff17aa2d, the concealed password was passed to the process.

Change-Id: I69aab38e8898e5416231e863484e6702f3357841
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-15 06:45:17 +00:00
hjk
ca61a35910 Android: Edge towards AndroidApkBuildStep aspectification
Unexport AndroidApkBuildStep, remove AndroidBuildApkWidget file
pair, de-Q_OBJECT-ify AndroidBuildApkWidget (and as roadkill
PasswordInputDialog).

Change-Id: Id3b51dd33774aac70a4f23a8ab4cfb556ed1f2b5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-15 05:15:31 +00:00
Lukasz Ornatek
df696a34b5 Cannot input Korean in FromEditor/Property panel
Warkaround suggested by Eskil Abrahamsen Blomfeldt, using QQuickWindow
instead of QQuickWidget

Task-number: QDS-2350
Change-Id: I794cb48cf4f6b57ed928e76c0dca442c6f39ff0c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-14 12:40:31 +00:00
Christian Kandeler
226982b7b0 OutputFormatter: Fix flushing a pending line feed
... for the edge case of a lone carriage return occurring in the output.
Amends b0cad9e9c7.
Also adds missing adaptations to the unit test.

Change-Id: I219b24b8fb41bb0fcea9f677cd79286d03b130c2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-14 10:00:03 +00:00
hjk
b5e51e4f97 ProjectExplorer: Inline MakeStepWidget
Change-Id: I4ed1f188b9480edc964fe16b896a00fe37cc0cc9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-14 09:37:47 +00:00
Christian Stenger
6ab7013579 AutoTest: Fix summary for boost
Do not take skipped tests into account when computing
passes out of the available information.
These are handled separately and may lead to a negative
passes amount.

Change-Id: I47bb1f054468dc5374d0d4e7fdeb3ad87efd0dff
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-14 08:56:10 +00:00
The Qt Project
6ba67e5161 Merge "Merge remote-tracking branch 'origin/4.13' into master" 2020-09-14 08:49:06 +00:00
Assam Boudjelthia
14024f810e Android: expose deployment warnings and errors to issues pane
This makes the deployment process more transparent and easy to follow
warnings and/or errors.

Change-Id: Ie6a7bde4dfb5748adff1be077299ecdceb0e3930
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-14 08:33:04 +00:00
Eike Ziller
20f51bc642 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	src/plugins/languageclient/languageclientcompletionassist.cpp

Change-Id: If12e1c532e5623ef063681309a918e7b51117b1c
2020-09-14 10:12:14 +02:00
Eike Ziller
58d288b523 Proparser/QtSupport: Fix build with Qt6
Pulls in some QStringView related updates to proparser:

f5d8ad61a4c85a656a7332c43d0c42f5eaf43593
"qmake: use new QString::arg(QStringView) overload"

52f3a7d9d40d3bf835bb0716ad201ee56731b980
"Build qmake with QT_USE_STRINGBUILDER"

c49728eb27be0f3f2eaaa77b0ed573f5d8705af1
"Port qmake from QStringRef to QStringView"

But do it in a way compatible with Qt5. Since some QStringView API is
not available in Qt5 (see QTBUG-86516), this means using a StringView
typedef that is either QStringRef (Qt5) or QStringView (Qt6)

Task-number: QTCREATORBUG-24098
Change-Id: Ic9a73ca450543f3fdd5fcf9d686c4b773a48854c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-09-14 07:26:54 +00:00
Kai Koehne
73ac5a3d87 IncrediBuild: Add plugin metadata
Change-Id: I76ea1ee35628db6c4cf87fa81d1fee49e4c0ef36
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-11 15:10:35 +00:00
Knud Dollereder
3bce5f2e76 Convert the CurveEditorDialog to a view-plugin
Continuously send frame-changed signals when dragging the playhead
Fix timescale painting
Paint playhead behind the valuescale

Task-number: QDS-2551
Change-Id: Ia8d3952b4401500a4c6d31ff9f5742ff44b2c092
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-11 13:28:09 +00:00
David Schulz
3a51cdf2ba LanguageClient: avoid recursive postponed document update
Change-Id: Ibaf8831977e254c7dad10617754e763114993aee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-11 11:57:34 +00:00
hjk
d06207d4aa Core: ProcessReaper code cosmetics
- Rename ReaperPrivate to ProcessReapers
- drop the used ProcessReaper::m_futureInterface
- sprinkle some private and final
- remove unnecessary Q_OBJECT
- remove unnecessary #include, fix accidental user

Change-Id: I2787815975dc80cb93db2132bbfe7ce9a74ebd5f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-11 11:49:13 +00:00
David Schulz
3b23cab385 TextEditor: Use selection format from the setting
Overwrites the format generated by QPlainTextEdit::getPaintContext()

Amends 9182d4eda7.

Fixes: QTCREATORBUG-24479
Change-Id: Ia226a74442dbbdbae42e8da5dee9e4d7399b677c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-11 11:48:29 +00:00
Christian Kandeler
23d63dcc8b TextEditor: Do not invoke auto-completion recursively
It's unclear why that was done, and it threw off the clang code model by
introducing an unexpected sequence of events.

Fixes: QTCREATORBUG-18676
Change-Id: I4dabb56eb97e18141080c22be324c826202977ce
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-11 11:44:35 +00:00
Christian Kandeler
a89e3e22b9 CppTools: Guard against null pointer access
... when looking up definitions of variables.
Amends a0764603d0.

Fixes: QTCREATORBUG-24610
Change-Id: I79e6f69066eaa385013e722ec4793c27231ab8eb
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-11 11:44:02 +00:00
Alessandro Portale
6aced79f18 Android: Build fix #2
Change-Id: I1ea4d753889d3da8c357d0a388af1c04797b0759
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-11 11:40:41 +00:00
hjk
57f5fbbf57 ClangTools: Do not try to kill subprocesses syncronously
Task-number: QTCREATORBUG-24627
Change-Id: Iec0169335d62435c017e39f252be3d7ca470d2d4
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-11 11:31:01 +00:00
Alessandro Portale
651cbfece7 Android: Build fix
Change-Id: Ia5f2118971ae6a7d0c13b8ea82c146b0b678b848
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-11 10:50:49 +00:00
Assam Boudjelthia
e9c9440653 Android: allow passing apps arguments via manifest on non-debug mode
Uses 00a1e5da7e1aea373a7e6be1d51e1573ff167dd8.

Task-number: QTCREATORBUG-23712
Change-Id: I9a7e134420b608815589578f3851abf150674fd3
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2020-09-11 10:00:32 +00:00
Marco Bubke
0f9010d381 QmlDesigner: Introduce multiple node instance server
For capturing data we need a atomic mechanism. So in one
process multiple node instance server can be started and
then a command is send back that a scene is created. It
can be used to ensure that captured data of views is
up to date.

Task-number: QDS-2630
Change-Id: Iea8d0b036b6384c9c1b0f91af401f2b1f1978c12
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-11 08:57:42 +00:00
Mahmoud Badri
29bc4801e3 QmlDesigner: Display only file names in comboboxes
Full paths are displayed in tooltips. Also add a check mark to
the selected item in the combobox's pop up.

Task-number: QDS-2405
Change-Id: I69cbd4200a73183b4e747c87e9dd8197fc650ed7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-09-11 08:40:18 +00:00
Dominik Holland
a535196c41 Add support for multiple Qt versions in "Load QML Stack"
Enable the functionality for cdb again.

Change-Id: I75405f830dd208cc110d6682a45beedf2f4199cc
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-09-11 08:11:21 +00:00
Kai Koehne
0773a0fb66 Autotest auto tests: Fix license
No point in using a commercial-only license here.

Change-Id: Ic8f38c4a09dcfaf6c1a537bdfd97cb9eedf50dd8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-11 07:49:43 +00:00
Miikka Heikkinen
8dbe3fe61f QmlDesigner: Add navigator preview tooltip for images and textures
Show custom tooltip for image and texture items that shows the source
image.

Task-number: QDS-2750
Change-Id: If8c491f513d9fcada74300206d6cbc3af80c7663
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-11 07:38:13 +00:00
Miikka Heikkinen
0b6be2f93d QmlDesigner: Update resources file system model on model attach
Removed the update from old places.
ViewManager::attachItemLibraryView one was never called and
the other DesignDocument::updateFileName one gets called incorrectly
on any file rename, not just the currently open one.

Change-Id: I822ced6fe32dd9625d605e33046c808eb2272028
Fixes: QDS-2721
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-11 07:36:06 +00:00
Andy Shaw
e35af70d98 Android: Use c++_shared for STL as cxx_shared is not correct
This fixes a parsing problem from CMake as it will state:
"Invalid Android STL: cxx_shared." This amends
01b0d4f8f5

Change-Id: I315d36eac889ba53d76055814c6b43a453e1e2f7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-11 07:34:11 +00:00
Kai Koehne
90a4e8d3d0 Nim: Fix plugin metadata
The actual source files say it's Commercial OR GPLv3+Except, so
make the plugin information reflect this.

Change-Id: I867b3a27fb903719d30e32bf28418700f2c02bc5
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-09-11 07:24:00 +00:00
hjk
d09ea40c25 CMake: Fix several issues with the CMakeBuildStep
- Store the selection of the "Current executable" target again
  (broke apparently with 2c822ae3)
- Display the resolved target of the "Current executable" seletion
  in the command line, instead of the fixed "
   '<Current executable>' text
- Make the "Current executable" translatable
- Add a tooltip explaining what it is
- Use a Utils::TreeModel instead of a QStandardItemModel for the
  target model
- As side-effect, searching in the target view using Ctrl-F seems
  to magically work again.

Change-Id: Ia4d0913f6e586f49f74da66651a9177437dad6d9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-11 05:00:04 +00:00
Christian Stenger
512c0381f3 Nim: Fix handling of project settings
Removes unused duplicate of nim specific project settings
and uses the nimble specific project settings additionally
inside nimble projects.

Change-Id: Ibbda76ab41538a0ebdf0a395503c519fcac93460
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-09-11 04:56:15 +00:00
Cristian Adam
b9445d5627 Clang 10 build fix
Qt Creator 4.13's code model and Clang 10 compiler complain like:

error: constexpr variable 'LocalSocketErrorFunction' must be initialized
by a constant expression

Change-Id: I9c0160823f9f3708253ebea398caae680eacab11
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-10 15:54:30 +00:00
Alessandro Portale
b6e4c9e133 Android: Remove some unused functions
Change-Id: I5c6549ed931b5132898abd6ce519560851838e65
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-09-10 11:38:50 +00:00