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
Thomas Hartmann
28200eda8a
QmlDesigner.PropertyEditor: Fix scope of format property
...
Change-Id: I44c9adb953bb4b8a548af019bc66ff6081df0319
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2014-06-26 12:50:19 +02:00
Thomas Hartmann
95bcd0883f
QmlDesigner.PropertyEditor: Fix TextEditSpecifics
...
I moved the property format into Text section, because
having two sections with even the same name was confusing.
The format property also is not really related to "Text Input".
Since the distinction between plain and rich text is very important,
it makes sense to have this property in the first section.
Change-Id: I4d66ed4a24fe0d99d394c17d149c830db2c6d3b8
Task-number: QTCREATORBUG-12452
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com >
2014-06-18 16:41:34 +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
3717d913e1
QmlDesigner.PropertyEditor: fix label
...
Change-Id: Ibf92f565f9b33f5739bb3e0a19920f160c0b44f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-11-08 16:26:54 +01:00
Thomas Hartmann
be8cee36bb
QmlDesigner.PropertyEditor: fixing the layout for StandardTextSection
...
Change-Id: Iea1a30b8718ccaafec3388aa793119443b1fe38c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com >
2013-10-23 11:25:40 +02:00
Thomas Hartmann
940a577755
QmlDesigner.PropertyEditor: adding standard section for text
...
Change-Id: I82bbb32c9b46c922dfa0163826c316638f35aa24
Reviewed-by: Marco Bubke <marco.bubke@digia.com >
2013-09-19 15:56:33 +02:00
