Commit Graph

20 Commits

Author SHA1 Message Date
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
f112076227 QmlDesigner.ComboBox: Minor fix
If we cannot read the index we set the index to 0.

Change-Id: Id990ca1640f9314931af9249c798c8b51ea5c0bb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-08 09:45:13 +02:00
Thomas Hartmann
e518074a4b QmlDesigner.PropertyEditor: Allow "manual mapping" in combo box
Sometimes there is no trivial mapping between model and values.

Change-Id: I2617f14828b97ba7352aa3a8f3d2ebb9fd2f3809
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-23 17:37:34 +02:00
Thomas Hartmann
001b93d9cb QmlDesigner.PropertyEditor: Fix ComboBox
We have to wait until the model is properly set until we react
to currentTextChanged. We also have to guard against binding loops.

Task-number: QTCREATORBUG-12257
Change-Id: Id602f6f192962e83a6166bf24a0711b22baa7868
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-20 10:57:15 +02:00
Thomas Hartmann
a513347086 QmlDesigner.PropertyEditor: No transactions based on focus
This is to fragile and allows many opportunities for serious bugs.

Change-Id: I2e49c37db4c1dd2c55000013d8ec7e0978d1ef89
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-14 15:37:03 +02:00
Thomas Hartmann
150803bc31 QmlDesigner.PropertyEditor: Fix echo mode
TextEdit does not have an echoMode property
and for TextField it has to be an integer.

Task-number: QTCREATORBUG-11136
Change-Id: Ib560dd18ed31f9a735fd2c6874334e1479fd3a31
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-25 17:52:11 +01:00
Thomas Hartmann
df4a28dd40 QmlDesigner.PropertyEdior: Fixing ComboBox
If there is no enum value fall back to the instanced value.

Change-Id: Idd4654d6e9fb8d4afd3df0855861511bc06454c1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 17:38:59 +01: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
964815614d QmlDesigner.PropertyEditor: code style fix
Change-Id: Idadf59d90d64abf908fc7cfa58fc217f6c335c6f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-04 13:43:47 +01:00
Thomas Hartmann
f06d1ae0bf QmlDesigner.PropertyEditor: cleanup of unused code
Change-Id: Ia62b8cc0889ed6ccb83cada5718b75c5205fa2a6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 17:44:43 +02:00
Thomas Hartmann
60710f6c05 QmlDesigner.PropertyEditor: moving the color logic into component
Change-Id: I3d90618f5826cf77cc9813fd3b31fbfdbd5b50e7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 14:38:29 +02:00
Thomas Hartmann
4a8a33179a QmlDesigner.PropertyEditor: adding functionality to ComboBox
* Adding the ExtendedFunctionButton
* Adding blue highlight for modified values

Change-Id: I2035ebba61b27ec5c75f02abc3a435709cc69f43
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 10:16:46 +02:00
Thomas Hartmann
50c9661ca3 QmlDesigner.PropertyEditor: fix for ComboBox
Change-Id: I766cdf7831509fa7d4e6c6b98f304b814f2f4e76
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-22 17:01:58 +02:00
Thomas Hartmann
2e1acc119f QmlDesigner.PropertyEditor: styling ComboBox
Change-Id: I2de6d06dcc89e845eedd087671a6a4c9df7b62f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 10:02:20 +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