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
b11bfd5652
QmlDesigner: Disable more properties for QUL
...
Disabling more items in ItemLibrary and properties
Change-Id: Ib019c1cbe356e0f7e3889d3500c080b0f5756c34
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io >
2020-09-03 08:39:26 +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
07f8c1d0f3
QmlDesigner: Add padding for QtQuick positioner
...
Add PaddingSection for Column, Row, Flow and Grid positioner in
PropertyEditor.
Task-number: QDS-1501
Change-Id: Icd7b6ed2ab371e3a821e725668ca0c9c63d1c1c9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io >
2020-04-21 10:38:10 +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
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
a9f6f2519b
QmlDesigner: Allow negative spacings for positioners
...
Change-Id: I610127421b071a4bf4ed0d21aeab2b2f0c089d28
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com >
2014-09-11 11:15:54 +02:00
Eike Ziller
236ea9efb9
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
share/qtcreator/debugger/dumper.cpp
share/qtcreator/debugger/dumper_p.h
share/qtcreator/debugger/test/main.cpp
src/plugins/debugger/gdb/classicgdbengine.cpp
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.h
src/plugins/debugger/lldblib/guest/main.cpp
src/plugins/debugger/lldblib/ipcengineguest.cpp
src/plugins/debugger/lldblib/ipcengineguest.h
src/plugins/debugger/lldblib/ipcenginehost.cpp
src/plugins/debugger/lldblib/ipcenginehost.h
src/plugins/debugger/lldblib/lldbenginehost.cpp
src/plugins/debugger/lldblib/lldboptionspage.cpp
src/plugins/qbsprojectmanager/qbsstep.cpp
src/plugins/qbsprojectmanager/qbsstep.h
src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
src/plugins/qnx/blackberrycheckdevmodestep.cpp
src/plugins/qtsupport/debugginghelper.cpp
Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +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
Marco Bubke
07222ba46a
QmlDesigner: Refactor enumeration handling
...
Change-Id: I0e163147a0303741af52127ece6f6afd0d2aa658
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-12-16 12:55:06 +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
ee4fd52ade
QmlDesigner.PropertyEditor: adding RowSpecifics
...
Change-Id: I1883e33d2d169f54e352a131f11dce4fa4c86748
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-10-09 12:45:56 +02:00
