Commit Graph

67787 Commits

Author SHA1 Message Date
Henning Gruendl
4ba6c7988e QmlDesigner: Icon visibility in navigator
Show alias, visibility and lock icons in the navigator only when either
checked or hovered.

Task-number: QDS-2785
Change-Id: I1eca1b9f44cfbdd839daa64849156e1c9ffa4acd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 15:25:06 +00:00
Henning Gruendl
2860e57112 QmlDesigner: Add lock functionality to navigator
* Update icon font and change related theme and constants files
* Add locked column to Navigator
* Add auxiliary property "locked"
* Integrate locked feature into the following components:
  * Transition Editor
  * Connection Editor
  * Form Editor
  * Text Editor
  * Timeline
  * Navigator
  * State Editor

Task-number: QDS-826
Change-Id: Ibf3ae96e0d5daeb1ab00279b94df5aaabe75e0bb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 15:24:55 +00:00
Leander Schulten
15f39cf37c CppEditor: Fix Typedef Handling with 'Remove Using Directive' QuickFix
Previously, typedefs were ignored and the new code became invalid after
applying the quickfix.

Change-Id: I0d4295e90d02dfacc3edac5ac3f96d9edbeaf662
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-12 14:34:54 +00:00
Thomas Hartmann
7ec2fd482e QmlDesigner: Show anchors menu only if applicable
Change-Id: I09e6e14f96b62b561027694ebc5a73b51c6ab8d8
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 14:32:55 +00:00
Thomas Hartmann
9e064b158e QmlDesigner: Disable group menue if selection is empty
Change-Id: I1b64bbe7a6217ed08c8a1f72435cd67eea6209a0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-12 14:03:30 +00:00
Mitch Curtis
7c58a4ac5b Replace references to Qt Quick Controls 2's Default style with Basic
The Default style was renamed to Basic.

Task-number: QTBUG-85984
Change-Id: I147951c734165274561edf057292ad3192c681ea
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 13:16:02 +00:00
Orgad Shaneh
f60302591b Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: Ifa2e1ced939e1d049ba6de667b31ab9945094b87
2020-10-12 14:55:54 +03:00
Christian Kandeler
023a77ea80 CppEditor: Consider templates in "complete switch" quickfix
Fixes: QTCREATORBUG-24752
Change-Id: I39bc007e5f493a9826adb4575eb210bf9ec21159
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-12 09:01:29 +00:00
Christian Kandeler
bd05e01e3d ProjectExplorer: Make default build dir template backward-comaptible
Otherwise, switching back and forth between QtCreator 4.13/14 will
inject new variables into the old Qt Creator, where they are not
available.
Amends b55825a420.

Fixes: QTCREATORBUG-24740
Change-Id: I6c77626c790005c80b716e5b8006d7034c0f150b
Reviewed-by: hjk <hjk@qt.io>
2020-10-12 09:00:28 +00:00
Christian Kandeler
996ed6e378 ProjectExplorer: Fix compile output window scroll issue
Flushing the formatter directly from the build manager interferes with
the scrolling logic in OutputWindow.

Fixes: QTCREATORBUG-24728
Change-Id: I018944a44bcc3115c17ba83708da8f155b496f39
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-10-12 08:59:03 +00:00
Christian Kandeler
e76d294c00 ProjectExplorer: Fix small visual glitch when rebuilding
All but the first build would insert an extra newline at the top of the
compile output window.

Change-Id: Ief88acfb6226ec2d1de9865f041e9f07c48f6c49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-10-12 08:58:25 +00:00
Miikka Heikkinen
47714c38c6 QmlDesigner: Return placeholder preview image for non-visual components
Preview image is returned when a 2D item render results in a blank
image.

Also improved device pixel ratio handling. No longer always render
preview at 2x ratio, if not needed.

Change-Id: I67b7563dffea523ea85be23b6a0e8b802c0f03fb
Fixes: QDS-2893
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-10-12 07:33:56 +00:00
Tim Jenssen
ddb078404a qmlpreview: add test translation color settings
Change-Id: I9b11fcf1fdae39b089887884a3d96cc8648a0c8a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-12 07:27:57 +00:00
Tim Jenssen
d674548040 qmldesigner: fix missing update after setFrameColor
Change-Id: I9d809bb62bdd3b0d141e1cff39cbf4a9fca58c39
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-12 07:27:48 +00:00
Tim Jenssen
22545933b6 qmldesigner: use right include syntax
Change-Id: Iafd04ad287bac6b0c94359fa54893904de61aa96
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-10-12 06:52:42 +00:00
hjk
632582371c ProjectExplorer: Restructure BuildStep summary update
Move the first update from immediately after setting the updater (not
necessary when the summary never got shown, and too early to take
fromMap() data into account) to widget creation time.

This fixes the "Invalid Command" display for CustomBuildSteps
after project loading even if the command is valid.

Alos make sure we don't accumulate connections on repeated
config widget creations.

Also make sure this is not lost in createConfigWidget
re-implementations.

Change-Id: Ib8d07fbf1f0aefc45c66f74617c8fc882dc1f68e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-09 15:18:44 +00:00
Thomas Hartmann
29c833d54f QmlDesigner: Implement different render path for Qt 6
When building with Qt 6 or if qmlpuppet_unifiedRenderPath is set
in the environment we switch to a different render path.
In this case we use QQuickWindow::grabWindow() and render the root item.
No composition is done in the Qt Creator process anymore.
This is a similar approach we already take for the 3D view.
Performance is acceptable and we fix rendering issues related to
effects and layers.

Change-Id: Ic963eca047e0bf16ca3a099ec94658ae2af0fb63
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-09 15:13:39 +00:00
Leena Miettinen
2fe99cef9f Doc: Describe new actions on CMake parameters
Multi-selection of parameters is now enabled, as well as
clearing the selection, unsetting multiple parameters at
a go, and undoing the unsetting.

Task-number: QTCREATORBUG-24529
Change-Id: Ie87e6e5bf081fd6d70e3a9461ca8489fb3a71589
Reviewed-by: hjk <hjk@qt.io>
2020-10-09 14:42:58 +00:00
Eike Ziller
75d97f9ea7 Unconditionally include Script locator filter
We require Qt 5.14 now.

Change-Id: I7da06b0071f7998fd723712f97111c5d31bba9b8
Reviewed-by: hjk <hjk@qt.io>
2020-10-09 14:40:33 +00:00
Eike Ziller
9192de91b4 Merge remote-tracking branch 'origin/4.14' into master
Change-Id: I8fa31853863de717ef68dcd9d39dfece6a6cdfc4
2020-10-09 16:39:20 +02:00
Eike Ziller
8add61b216 Merge remote-tracking branch 'origin/4.13' into 4.14
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ia779a511d73d86d79dbcecd8cc3763cf3d605a87
2020-10-09 16:35:27 +02:00
Eike Ziller
75adba735b CMake build: Build Qbs if the submodule is available
Includes update of Qbs to current head of master, which enables this
feature on the Qbs build system side.

Fixes: QTCREATORBUG-23905
Change-Id: I9a537b640b7f7a753839ace3e44d174c8e0af526
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2020-10-09 14:27:54 +00:00
hjk
a722b7a093 ProjectExplorer: Fix CustomProcessStep
Only display worked, the command was not used for running.

Change-Id: I6afc65d97310fe14a58136393bd0657127d8afca
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-09 12:08:11 +00:00
hjk
96d33bb8f8 ProjectExplorer: Remove unused KitAspectWidget::dirty signal
Change-Id: Iabf37b3806eae4dcde73927bd540723a7b8f88bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-09 11:49:20 +00:00
Dominik Holland
db4b3641f5 qmlprofiler: Fix a crash in the rangeFilter
Always check the stack before popping an element.

Fixes: QTCREATORBUG-24730
Change-Id: I7dc6363137ef002219fbc49b7343cff8112a58c2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-10-09 11:38:28 +00:00
Alessandro Portale
6e70ced113 ProjectExplorer: Show "<file path>" for "-ensure-kit-for-binary"
Don't show double angle brackts: "<<file path>>"

Change-Id: I19a346b216b9b96f28c40b2d9bd5659449926174
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-09 09:42:25 +00:00
Leena Miettinen
b5af9151bc Doc: Update info about using Clang tools
Task-number: QTCREATORBUG-24529
Change-Id: I3abca4ae3061f1b940ad4f0ee0471bb84a05e63f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-09 09:39:55 +00:00
hjk
7527bbcf2c ProjectExplorer: Move KitAspect related layout code
... from KitManagerConfigWidget to KitAspectWidget (which is not
really a widget, but...)

The modification for the alignment handling only affect this use
here. Long term I hope this can be handled centrally (e.g. always
use the special form label alignment for labels in the first column
when some LayoutBuilder bool property is set, instead of doing that
for each use), so this is not necessarily a final API.

Change-Id: I678dba45ee68ca9706569715d232f98363de8636
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-09 09:05:57 +00:00
Alessandro Portale
a8e704bd82 ManhattanStyle: Improve dark theme look of some widgets
This improves the visibility of radiobuttons, checkboxes, lineedits,
groupboxes, frames and tab-close indicator in dark themes.

Scrollbars, spinboxes and the arrow button of an editable combobox are
not handled by this change.

Task-number: QTCREATORBUG-23505
Change-Id: Ieba94f3847a3c2e0da7e9b554e1026525618f49f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-09 08:25:10 +00:00
hjk
9fe48b36e4 Utils: Re-use BaseAspect's m_settingsKey for SavedAction
Change-Id: I7ebc8013f15970a56315b3da80969808e505b3bf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-09 08:08:50 +00:00
Christian Kandeler
2287def85e clangbackend: Fix crash
We cannot assume that a Q_PROPERTY name is on the same line as the
keyword.

Fixes: QTCREATORBUG-24746
Change-Id: Ic2e02291e24c1abbaf72881b540a26c82899cb2c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-09 08:06:56 +00:00
Eike Ziller
94b9b33a17 Install pythonXY.zip for qtcreatorcdbext
Fixes: QTCREATORBUG-24528
Change-Id: I0db1407c17ff00a7424b8b8c229f503dc4891a12
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-09 06:29:38 +00:00
Orgad Shaneh
7e4364fb70 VCS: Do not focus on the pane every time it becomes visible
Fixes: QTCREATORBUG-24425
Change-Id: I727913eeeae34e6d656bfc5b17a737c5bcbffe88
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-10-09 05:23:28 +00:00
Orgad Shaneh
4b6a6acc4e Core: De-pure IOutputPane::visibilityChanged()
Most implementations are empty.

Change-Id: I811cacfc2918c8b2803798c4f5d3dabc7d60ccd1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2020-10-09 05:23:17 +00:00
Assam Boudjelthia
d1a42414c5 Android: fix misleading warning when creating an AVD
When no system images are installed in the used SDK path,
the warning should point to install a system image because
none are installed instead of blaming the SDK.

Task-number: QTCREATORBUG-24754
Change-Id: Ic3dc6cb25f014f4216fd63636b3b312b14f76e6d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-10-08 18:18:21 +00:00
hjk
ce2c18dd68 Help: Some Qt 6
Change-Id: I30553e491e5dfc119ac1527c8a2419b6d18647fc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-08 15:39:10 +00:00
hjk
a27b162407 PerfProfiler: Compile fix for Qt5
Amends 67c800af6e.

Change-Id: Ia0bb003d3e83027d060c97a1bcf8758db00d9281
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-10-08 13:57:46 +00:00
hjk
fe0ee642b5 QmlDesigner: Compile with Qt 6
Qt 6 does cannot handle forward-declared types in signal declarations.

Change-Id: Iad4a810841df3d077750ad76c892bdb7eecc0a80
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-08 13:39:16 +00:00
hjk
852985b2ca Help: Sprinkle some QLatin1String
Change-Id: I395742c2255b50c0a9017f86c7e7dca5a8535542
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-08 13:32:21 +00:00
hjk
67c800af6e PerfProfiler: Some Qt6 compilation
Remaining issues operator<<(DataStream &...), the timeline dependency
and qmlRegisterType.

Change-Id: I51556e67cd93cb8bdced569ca509929705da80b4
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-10-08 12:51:48 +00:00
hjk
41a51a63f5 ClangCodeModel, Puppet, CrashHandler: Compile with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ic65e7a5dce0a512f48fb70915b9443ef7df2b787
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-08 11:16:09 +00:00
Eike Ziller
0f87be729c Bump version to 4.13.3
Change-Id: Ia546dc945af578105ad959005e7e710f5d592573
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-08 10:50:30 +00:00
Eike Ziller
3ee70780b4 Qt6: Sprinkle QLatin1Strings for QStringView comparisons
Task-number: QTCREATORBUG-24098
Change-Id: I2fb79bcfd0537a6704a1ee8db840401d6beca7a0
Reviewed-by: hjk <hjk@qt.io>
2020-10-08 10:38:47 +00:00
David Schulz
cf460578ff Debugger: fix various dumper tests for mingw
since the gdb uses to hang on windows when calling functions we disabled
that functionality reflect that in the QDateTime and QLocale tests.

Change-Id: Ie212ab8c7634804e1054bfddfb753de055403c4f
Reviewed-by: hjk <hjk@qt.io>
2020-10-08 10:36:56 +00:00
Cristian Adam
b9cd1cc15e CMake Build: Fix PCH builds for non MSVC platforms
Ammends 2129a04c5d

Change-Id: I50fc1bf2e5ef4742243aa08a4e5ad2bfee459eb1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-10-08 10:26:21 +00:00
Orgad Shaneh
d02c69d1bc DiffEditor: Improve initial size of description widget
Fixes: QTCREATORBUG-24286
Change-Id: I8844b30d287fcdc5333906d00d92e00d05f5560a
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-08 10:18:03 +00:00
Eike Ziller
15707ef0b6 Merge remote-tracking branch 'origin/master' into 4.14
Change-Id: I5efcf81bd8f5a5e6f0e5bbcc2fc1f5439e83acef
2020-10-08 12:07:09 +02:00
Eike Ziller
9828e6887e Merge remote-tracking branch 'origin/4.14' into master
Change-Id: Ie53b4c2516d80a653d51bc6b666040c586ce44ab
2020-10-08 12:04:06 +02:00
The Qt Project
e61152bf56 Merge "Merge remote-tracking branch 'origin/4.13' into 4.14" into 4.14 2020-10-08 09:58:48 +00:00
Leena Miettinen
fff49421ce Doc: Describe new keyboard shortcut for function tooltips
Task-number: QTCREATORBUG-24529
Change-Id: I34237f0f4c0d47588bfebc368a712eb38f205b60
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-08 09:16:33 +00:00