feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
43,591 Commits 108 Branches 368 Tags
b13f964fd5403d15ece89f89f9823dd19a2bc459
Commit Graph

17 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
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Thomas Hartmann
69ac7f8d1e QmlDesigner.PropertyEditor: Adding support for LayoutProperties 
Change-Id: Ie84517af3ce683505103bb9a868d7f2cbc2f2fdd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-02-06 09:20:33 +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
248964789a QmlDesigner.PropertyEditor: Allow abitrary anchor targets 
QTCREATORBUG-12077
Change-Id: Ifce1587235c81da56da6bc5788081cc1711d1bdb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-12 14:43:52 +02:00
Thomas Hartmann
9e466fe958 QmlDesigner.PropertyEditor: Refactor LayoutSection 
Avoiding duplication of code and giving the label more space.

Change-Id: Id0988fda89b7a671be5f57e511650bd7c73c2d84
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-03-20 12:24:00 +01:00
Thomas Hartmann
4b232e5690 QmlDesigner.PropertyEditor: fixing layout issues 
There were serious layout issues in the property editor.
While not 100% reliable reproducible they were quite annoying (TASK).

The reason for the issues were the existence of several QtQuickViews and
changing visibility of items.
The pane for Item and the empty pane for no selection use different
QtQuickViews in a StackWidget. Somehow visibility of items is not always
updated properly when changing the QtQuickView in the stack.

Solution: Do not use visibility but stack order instead.
For the layout margins/targets all controls are now always visible, but
unused margins/targets get disabled.

Task-number: QTBUG-36141
Change-Id: Iec62b81796301aaf483606d9aca5a4ad3572e98b
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
 2014-01-15 14:31:13 +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
d6274b1fc5 QmlDesigner.PropertyEditor: remove target selectors 
Not ready dor 3.0.

Change-Id: Ibf2632005873c1a2291ca230fa12d9374f606a92
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-30 19:41:23 +01:00
Thomas Hartmann
f2634b316a QmlDesigner.PropertyEditor: fix property name in LayoutSection 
Change-Id: I3ca4d1930a90c9d84019061f32a8d34d646fce98
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 18:01:25 +02:00
Thomas Hartmann
e4f4042bd6 QmlDesigner.PropertyEditor: fix names of margin properties 
Change-Id: I284b1ec1269afa38f62a3f9b2747440ce4eedc36
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 17:44:34 +02:00
Thomas Hartmann
ea6c6ccbe1 QmlDesigner.PropertyEditor: avoiding text eliding in LayoutSection 
Change-Id: I5635e2a304f7ad3c66d6eb17d2318af0dbd19037
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 13:43:02 +02:00
Thomas Hartmann
922286bf1a QmlDesigner.PropertyEditor: fixing LayoutSection 
Change-Id: I8c8bcee36b2e2ee1d2e32535da135ac5182459a5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 13:39:57 +02:00
Thomas Hartmann
cde0a8828d QmlDesigner.PropertyEditor: fix combobox for anchor targets 
Change-Id: Ib66e19ad2d70cb8c5fd295288a625af06104d40e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-22 17:05:12 +02:00
Thomas Hartmann
7839817110 QmlDesigner.PropertyEditor: fixing text label in LayoutSection 
Change-Id: Ia0a065da9f24de81147a9ae7d939654e24f0862c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-08 17:22:00 +02: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
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