aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-09-0319-1119/+3937
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RowSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml Change-Id: Ie5deacd39ae4f3c0966e7cb41a8fd832dcefbb09
| * QmlDesigner: Disable more properties for QULAleksei German2020-09-033-0/+38
| | | | | | | | | | | | | | Disabling more items in ItemLibrary and properties Change-Id: Ib019c1cbe356e0f7e3889d3500c080b0f5756c34 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * LLDB: Escape strings for correct parsingOrgad Shaneh2020-09-031-47/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sample broken output: >result={token="9",lldbid="1",valid="1",hitcount="0",threadid="0",oneshot="0", condition="",enabled="1",valid="1",ignorecount="0",locations=[ {locid="1",function="foo()",enabled="1",resolved="0",valid="1",ignorecount="0", file="F:\Projects\test\main.cpp",line="5",addr="4199979"},], file="F:\Projects\test\main.cpp",line="5"}@ When parsed as GdbMi value, the strings are expected to be escaped. Change-Id: Idb923516c1cf6e25b970ad08fae977bdf1045b4b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * QmlDesigner: Remove old propertiesAleksei German2020-09-033-26/+26
| | | | | | | | | | | | | | | | Removed and replaced old properties for ListView and GridView Change-Id: Ifbf2aae2958c5f67616d8f6a4acad6646b34c18c Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * QmlDesigner: Fix mobile scroll wizard templateHenning Gruendl2020-09-021-1/+2
| | | | | | | | | | Change-Id: I00d0467ce4ed28d0135e16c6ae9802ed66a1ff7d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Add support for .hdr to UrlChooserThomas Hartmann2020-09-021-1/+1
| | | | | | | | | | | | Task-number: QDS-2128 Change-Id: I944a42d36357cbddae6d5cc30178723e62e0656f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Update Russian translationSergey Belyashov2020-09-021-1032/+3660
| | | | | | | | | | | | | | | | | | Change-Id: Ifdbd70b4f225f8d64d408c9bed695f7e98b81eaf Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Olesya Gerasimenko <gammaray@basealt.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| * QmlDesigner: Compact option for label deactivationAleksei German2020-09-015-14/+20
| | | | | | | | | | Change-Id: Ie163f4c021212837b703d2615cbf78b953e056ec Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlPuppet: Fall back to primitive creation if component creation failsMiikka Heikkinen2020-09-011-3/+6
| | | | | | | | | | | | | | | | This ensures components defined in .qml files get loaded properly. Change-Id: I070132ab5ad58b2531f27f623f218e0ee3565c5b Fixes: QDS-2697 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Disable Properties unavailable in QULAleksei German2020-09-017-6/+102
| | | | | | | | | | | | | | | | | | | | | | Disabling properties in: MouseArea Flickable Image Text (including Font) Change-Id: Id0a44fa73ff80bf4749c0bdc0f9eac3e2f488762 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Fix build of testsChristian Stenger2020-09-011-0/+1
| | | | | | | | | | | | | | Amends b0c47267d812. Change-Id: I62c8007156a0f9cebdcc83c2f4cef135e19d27e2 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * QmlDesigner: Inline vector stream operatorsMarco Bubke2020-09-011-1/+34
| | | | | | | | | | | | Task-number: QTCREATORBUG-24548 Change-Id: I01d1b6e12c04c4ea47279e3a5046a0d3e34a5c09 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-318-144/+251
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/clangtools/virtualfilesystemoverlay.h src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui src/plugins/qmldesigner/designercore/model/abstractview.cpp Change-Id: I5013bd8fdd28d79cdea74380bec01d4c106adfaf
| * QmlDesigner: Update StateEditor layoutHenning Gruendl2020-08-314-109/+177
| | | | | | | | | | | | | | | | | | | | | | | | * Add alias properties to StudioControls AbstractButton * Add color to StudioControls theme * Update StateEditor layout due to issue with default label placement Task-number: QDS-2623 Task-number: QDS-2615 Change-Id: If46daab2293d42dff7d73c4cf9a0c370442c5694 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Update icon fontHenning Gruendl2020-08-273-31/+33
| | | | | | | | | | | | | | | | | | * Update icon font * Use newly added icons in EditableListView Change-Id: Ia21c2120c54c41cd00dca07622ced98a0bf7f7f0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Annotations for StatesAleksei German2020-08-271-0/+26
| | | | | | | | | | | | | | | | | | - Added Annotations support for States Task: QDS-2312 Change-Id: I204ec958f85bd0f05eae0abbb3848d6d59e7e397 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
| * QmlDesigner: Fix focus on EditableListViewHenning Gruendl2020-08-272-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | * Add an enum to the StudioControls ComboBox to indicate type of interaction * Force focus on last used ComboBox if activated signal wasn't send due to editing of the ComboBoxInput Task-number: QDS-2626 Change-Id: I20b1660a05923baacef30f91080642baacee0378 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Dumper: Fix size of refcount member in basic_stringOrgad Shaneh2020-08-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | It's an int. Still, the position is 3 pointer-sizes back due to padding (the next member after this struct is the char pointer). The pointer-size + bitwise stripping of the LSB probably doesn't work on big-endian archs. Change-Id: I4413d9b32986d1ea0be9abe1be4382ee36a9456c Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-261-1/+3
|\| | | | | | | Change-Id: I8b11dad770b37a7f6029ae818c9d92a24818e56d
| * Dumpers: Fix string+allocator dumper for old GCC versionsOrgad Shaneh2020-08-261-1/+3
| | | | | | | | | | | | | | | | | | | | Older versions of GCC headers don't have _M_string_length. Tested against GCC 4.4.4. Change-Id: Ib3a025edeb26afce7fd54acfb6e965e64200f024 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-251-0/+2
|\| | | | | | | Change-Id: Ib60df85a85fc1c94d8cc0dc23ea9fcdb4822bcab
| * QmlDesigner: Fix CapturedDataCommandMarco Bubke2020-08-251-0/+2
| | | | | | | | | | | | Change-Id: I7dbbce3c071440924550140002d81128befa3404 Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-2125-1312/+2800
|\| | | | | | | | | | | | | Conflicts: CMakeLists.txt Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
| * QmlPuppet: Fix build error for ChangeLanguageCommand on MinGWMichael Winkelmann2020-08-211-0/+4
| | | | | | | | | | Change-Id: I190097871e1abf6932fdbb93293e189af7809793 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Provide Object3DPaneThomas Hartmann2020-08-201-0/+229
| | | | | | | | | | | | | | | | | | | | | | | | If the QtQuick3D import becomes before the QtQuick import, then QtObject is not recognized as a prototype of the QtQuick3D types. Workaround: provide a pane for Object3D. Task-number: QDS-2648 Change-Id: I337a30d09233101a8e7b00cc2d145d8211933571 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Add Connections specificsHenning Gruendl2020-08-202-0/+113
| | | | | | | | | | Change-Id: I161f05c82f8c4114294a9c2609e4e3b50081db61 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Fix property editor template layoutHenning Gruendl2020-08-203-10/+27
| | | | | | | | | | Change-Id: Icc4dd3e1e0daabc98dbfd893e0511a4ac6d07b13 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Add State specificsHenning Gruendl2020-08-201-0/+81
| | | | | | | | | | Change-Id: Ia80688dc056eab190e80344ef4414d1be247c4e5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlPuppet: Refactor ChangeIdsCommandMichael Winkelmann2020-08-205-46/+18
| | | | | | | | | | Change-Id: I75de863121b66a5050226dd5c8914229cb1af608 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * QmlPuppet: Refactor ChangeFileUrlCommandMichael Winkelmann2020-08-204-42/+17
| | | | | | | | | | Change-Id: I900f530109b6cdbb22d8138094443b48834d16cb Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * QmlPuppet: Refactor ChangeBindingsCommandMichael Winkelmann2020-08-204-42/+14
| | | | | | | | | | Change-Id: Id3020a73f59a1adfd25066a37d083d923e77956b Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * QmlPuppet: Refactor ChangeLanguageCommandMichael Winkelmann2020-08-202-17/+9
| | | | | | | | | | Change-Id: I31813d13da753ba742488943afea673540b3a3fa Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * QmlPuppet: Refactor ChangeAuxiliaryCommandMichael Winkelmann2020-08-184-44/+20
| | | | | | | | | | Change-Id: I32eb04db96322883aa908e22724756f5e25ded09 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * QmlDesigner: Fix compilation of coretestsMarco Bubke2020-08-181-0/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 7856c2c2f025787f0b0f588bf6a01bf0fa48beea. There were files compiled which are not used in the tests but have external dependencies. So instead of using the preprocessor we simply don't link the source files in the project. Change-Id: Ibba4a1dace1868b016af7135262c795bb29af204 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Update German translationRobert Loehning2020-08-181-1097/+2211
| | | | | | | | | | | | Change-Id: Ib719b350b97b9df5d6178e61a39b77293c52613c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * QmlDesigner: Extend captured dataMarco Bubke2020-08-172-12/+45
| | | | | | | | | | Change-Id: I780815e6f42be4f3aceb1d784a685cc330572832 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Allow plain expressions to be set with LineEdit controlMiikka Heikkinen2020-08-171-3/+11
| | | | | | | | | | | | Task-number: QDS-2603 Change-Id: I10a1b513bc21b8736683d4ddc2e290c29b39696d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-142-0/+3
|\| | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: Ibb60b8a7ac531b239bb9c490da843d5cc1a6300a
| * QmlDesigner: Fix linux buildMarco Bubke2020-08-132-0/+3
| | | | | | | | | | Change-Id: I32f560e18def0a72f2b94ab2fa9e8b6ea20f1bc4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Fix different UI aggregation styles for widget project wizardEike Ziller2020-08-142-5/+26
| | | | | | | | | | | | | | | | | | This got lost during the transition to JSON. Amends 241efa353db74aca3c91c7810ae794ad8f5c7b65 Fixes: QTCREATORBUG-24422 Change-Id: I51dec2e84adb3c5944ecaf83697f3e776bd3d7f1 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-1316-164/+495
|\| | | | | | | | | | | | | Conflicts: src/plugins/android/androiddeployqtstep.cpp Change-Id: Id624bad384050d567efba0700046331086cb12dd
| * Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-08-1316-164/+495
| |\ | | | | | | | | | Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
| | * Prepare merge of qds-1.59 to 4.13qds-1.59Marco Bubke2020-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | It is not compiling but we are closing this branch anyway. Change-Id: If96318175d92ae492871d668d5c937c473fd05d5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: Split messaging and process for puppetsMarco Bubke2020-08-1015-155/+432
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to implement custom puppets. The new connection manager will restucture the code and it add a mechanism to capture data too. Task-number: QDS-2529 Change-Id: I5d15c3303ef1c9a3e25ba197d350e0d561ce813a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * Support multiline text, fix text formatLukasz Ornatek2020-07-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Explicitly set TextFormat to "RichText" when using rich text editor Task-number: QDS-2229 Change-Id: I8f0110415b8125465779231426e66ecc53eae5fe Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| | * Support multiline textLukasz Ornatek2020-07-211-3/+59
| | | | | | | | | | | | | | | | | | | | | | | | Use rich text editor widget as dialog for multiline text input Change-Id: I13147e776867032fe1145d6a8a37fcd6976399e4 Task-number: QDS-2229 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| | * QmlDesigner: Fix prefiew sizeMarco Bubke2020-07-171-4/+1
| | | | | | | | | | | | | | | Change-Id: I126c50209f2849d0212f0d295b35cba0f25f2728 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-138-0/+26
|\| | | | | | | | | | | Change-Id: I1c426d95eedd82bd4470a64a9bafd734d23081ac
| * | QmlDesigner: Add 3d axis colors to themeMiikka Heikkinen2020-08-118-0/+26
| | | | | | | | | | | | | | | | | | Task-number: QDS-2404 Change-Id: I16f9deb7ba6698adafdd1cc0c8bec868731e1aa8 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-1047-958/+1192
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/cmakeprojectmanager/cmakebuildstep.cpp src/plugins/cmakeprojectmanager/cmakebuildstep.h tests/auto/debugger/tst_namedemangler.cpp tests/auto/qml/codemodel/check/tst_check.cpp Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 09:14:06 +0000