Commit Graph

13 Commits

Author SHA1 Message Date
Eike Ziller
3b76714290 Merge remote-tracking branch 'origin/4.13' into master
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
2020-09-03 12:18:02 +02:00
Aleksei German
d6da7745fa QmlDesigner: Remove old properties
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>
2020-09-03 06:51:48 +00:00
Leena Miettinen
cf652d8a11 Qt Quick Designer: Fix tooltips and UI text capitalization
Follow the guidelines for capitalizing UI text.
Try to shorten the tooltips and use standard phrasing.

Change-Id: I76a0fdd99101d21a8023881988b1c7446d65b40b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:55:35 +00:00
Henning Gruendl
4cd3b10069 QmlDesigner: Layout and source cleanup
* Cleanup positioner specifics, mostly by adding ExpandingSpacer
 * Fix GridViewSpecifics SpinBox Label distance
 * Remove some semicolons
 * Add missing label (true/false) to CheckBoxes
 * Fix a few indentions

Change-Id: I2b86dde58ddfc1aa78ed3e11c41b0f4eedfc412b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-08-23 08:06:56 +00:00
Tobias Hunger
38cce7eb83 Update License according to agreement with Free Qt Foundation
* Update all files in share folder

Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-19 16:05:29 +00:00
Alessandro Portale
374f84acc7 Qt Quick Designer: License change to Qt Commercial + GPLv3
Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-18 12:12:57 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Tim Jenssen
67fef99766 QmlDesigner: toolTip -> tooltip and some qsTr fixes
- "tooltip" is how it is in the component so use this everywhere

Change-Id: Ib8caa26365e50e1f68e04768b051941bbebe146e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-30 16:47:05 +01:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Thomas Hartmann
f29a4acf1f QmlDesigner.PropertyEditor: Fixing enum scopes
Change-Id: I4f8402b863f929aed90384f119e49302a89c4cd2
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-06 15:06:01 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Thomas Hartmann
067c789c09 QmlDesigner.PropertyEditor: adjusting combobox sizes
Using Layout.fillWidth: true.

Task-Number: QTCREATORBUG-10413
Change-Id: Ia2771fa6e8a4cbb3acc3c2893fccbcb23fa78f6f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 10:21:01 +02:00
Thomas Hartmann
1169672ea6 QmlDesigner.PropertyEditor: adding GridViewSpecifics
Change-Id: I93f64fed7341f463379dbb790e28f0f7c5d9d65b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 18:21:47 +02:00