feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

22 Commits

Author SHA1 Message Date
Leena Miettinen
e2d33a85f2 QDS Property Editor: Replace "item" with "component" in UI text 
- Write ID in all caps
- Some other small fixes

Task-number: QDS-3778
Change-Id: Ib959a2b8d31c7e51ea9ed1cae398b115b01e63f8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-03-18 13:07:22 +00:00
Eike Ziller
3944162039 Merge remote-tracking branch 'origin/4.13' into master 
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
 2020-08-10 15:56:54 +02: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
58ea14aea7 QmlDesigner: Controls 1 cleanup 
* Replace ScrollView Controls 1 with ScrollView Controls 2
* Replace TabView with TabBar and StackLayout
* Remove unused styles
* Replace Controls 1 imports
* Remove print statement in FontSection
* Fix layout width by correcting CheckBox width
* Remove TabView from QtObjectPane

Task-number: QDS-2454
Task-number: QDS-2455
Task-number: QDS-2456
Change-Id: I913d326afb012375dd5b804171cb8cd67681514c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-07-10 10:09:48 +00:00
Thomas Hartmann
4435a19979 QmlDesigner: Add Combo box for states 
Change-Id: I91494e297cc2c1aa4b192081b5cd31acbca87ce9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-27 11:21:14 +00:00
Henning Gruendl
104852e09d QmlDesigner: Update properties in property editor 
Add missing and cleanup existing properties in property editor.

Task-number: QDS-1502
Change-Id: I7bff7bad32b3bfd0742dd1d06f7c3ba12ef1bbca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-27 08:47:57 +00:00
Thomas Hartmann
a78522a800 QmlDesigner: Add states property 
Change-Id: I17162c01c9b54a70a726990510368cc363ccfb38
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2020-03-11 12:01:29 +00:00
Thomas Hartmann
620e17cf7b QmlDesigner: Implement usage of qtForMCUs property 
If qtForMCUs is set in the qmlproject file we disable unsupported
properties like roation, transformOrigin or layer.

Change-Id: I75d9677beca3d4ce71f975b4f0ae75e63967d143
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-02-28 15:27:36 +00:00
Henning Gruendl
428d8f0307 QmlDesigner: PropertyEditor cleanup 
* Adapt SpinBox ranges and decimals
 * Add missing qsTr() to labels

Change-Id: If85999a22778b6f61e30f7437905354884086596
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2019-09-03 09:12:29 +00:00
Thomas Hartmann
68a6c5dfd9 QmlDesigner: Use sliderIndicatorVisible for some properties 
Change-Id: I5827bd15c42f65f23f8b47a0f110c37311d26631
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2019-06-06 13:08:29 +00:00
Thomas Hartmann
337e8c71c8 QmlDesigner: Add more space 
Change-Id: I56c13be32d9dcb4fca43cd6577b2b06ffd71eaf8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2019-06-05 16:08:16 +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
2d78805b9b QmlDesigner.PropertyEditor: Adding label to origin control 
Task-number: QTCREATORBUG-11229
Change-Id: Ie884565f1cc75fc9554466b8fdea413f385c9200
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-17 10:07:38 +01:00
Thomas Hartmann
7c5069c2fd QmlDesigner.PropertyEditor: Ading missing QtQuick 2 only properties 
Those properties are QtQuick 2 only and were missing in the
property editor.

Change-Id: Ie58a4eac86b945bdde24d32fc373396268bb593e
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
 2014-01-14 15:15:17 +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
ed03740435 QmlDesigner.PropertyEditor: Adding missing control for TransformOrigin 
Now the TransformOrigin can be edited again.

Change-Id: Ie89c7aed2f092f303286091cc44655ff70dae777
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-15 15:12:52 +01:00
Thomas Hartmann
7849a363ff QmlDesigner.PropertyEditor: adding missing qsTr() 
Change-Id: Ifcda7118cce9858af4670d60d902868c9e45e90a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-08 17:21:51 +02:00
Jens Bache-Wiig
2067b049a7 Some initial styling for qmldesigner 
This makes the controls fit a bit better into creator.

Change-Id: I61dcd3a2db07281c437ef17604aef862d88876b9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-01 17:38:42 +02:00
Thomas Hartmann
ec436a6d64 QmlDesigner.PropertyEditor: initial prototype for QtQuick 2 
Change-Id: I85eac02934cd5f7f2f4664b9642c55bb3a23aa1e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-09-17 10:15:46 +02:00