feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
47,951 Commits 108 Branches 368 Tags
9ad8ec385e8cf93dcadff0c5482edb725e89f2d7
Commit Graph

55 Commits

Author SHA1 Message Date
Thomas Hartmann
9ad8ec385e QmlDesigner: If the scene looses focus change to selection tool 
* We forward the focusOut event to the tools
* The text tool now commits the data if the focus is lost
* Adding override

Task-number: QTCREATORBUG-16085
Change-Id: Ibdf6f60fc53e3c6c03222741c16cd8dd665618e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-10-11 12:29:36 +00:00
Tim Jenssen
ae5f1918b4 QmlDesigner: cleanup code 
Change-Id: Ia281b8efcacdfb00e724e97b491fbd4250a99fb1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-07-20 14:40:51 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +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
Marco Bubke
25a6a811c8 QmlDesigner: Move containerFormEditorItem in AbstractFormEditorTool 
Change-Id: I700ebd16d709eea7b3afb4a3c6089af7d4c87bf6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-22 13:12:11 +02:00
Marco Bubke
5a60c832b5 QmlDesigner: Harmonize DragTool with other tools 
Change-Id: I456641a0466ec7be4858629fd201a539b6c0fdfd
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-22 13:11:55 +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
721feaf5fe QmlDesigner: Remove workaround 
Because we can now commit a invalid transaction so we don't need to create
a new transaction.

Change-Id: I91bcd403d6a5a73df1c1b0b74f06eb3ff7423caa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-01-06 14:42:15 +01:00
Marco Bubke
6dce72ff6a QmlDesigner: Update ContentNotEditableIndicator for movements 
Task-number: QTCREATORBUG-10644
Change-Id: I23a02dae01faf703dbf9bd5bd643dc091a947eba
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-01-02 16:34:14 +01:00
Marco Bubke
9ae3e461ce QmlDesigner: Fix resize handle shown at start 
Task-number: QTCREATORBUG-10374
Change-Id: I68ec998ad156a74d37e0321e1538b0936fded8da
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-14 19:59:45 +02:00
Marco Bubke
3130aacc82 QmlDesigner: Add ContentNotEditableIndicator 
If you hover over a tab the content will be visulized as non editable.

Change-Id: If7fcc8aaa319e0f952f501f6e9e2fc767b89b636
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-18 13:19:38 +02:00
Thomas Hartmann
494d16f3cc QmlDesigner.FormEditor: using FormEditorItem::isContainer in MoveTool 
Change-Id: Ie30c0409cb2288c8c2cf649a92e7b54aa9481cb2
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-09-16 16:52:44 +02:00
Marco Bubke
9a3495cba1 QmlDesigner: Movable items should be have no xy binding 
Change-Id: I621472e4d51ceb786684ed0d69598724e853e4df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-04 15:13:34 +02:00
Marco Bubke
32ddd2b308 QmlDesigner: Add BindingIndicator 
Change-Id: I46a763f87e19114e223b9eb897cbb89cf1f4c3d5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-04 15:12:22 +02:00
Marco Bubke
480d014b44 QmlDesigner: Add AnchorIndicator 
Change-Id: I0cd4b3c9dc0178936ffd96d8acb443ce1a228d1f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-03 11:47:05 +02:00
Marco Bubke
e06f7e1db7 QmlDesigner: Move currentState to AbstractView 
Change-Id: I3252d85dceff606c85898895e91b7e955441033b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-31 16:49:13 +02:00
Marco Bubke
0dd5f68152 QmlDesigner: Rename actualState in currentState 
Change-Id: I49f80126a3fc0184a3b18352ed2adc24e50040c7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-31 16:37:29 +02:00
Marco Bubke
8e54a2a58d QmlDesigner: Move states functions from QmlModelView to StatesEditorView 
Change-Id: I1ac99fbf805b21823e062749bd3342be1641072a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-31 15:04:15 +02:00
Marco Bubke
fc6d51aff1 QmlDesigner: Support anchoring at snapping 
Change-Id: I3ec504e931ee63761538acb4666a3c8ce1a592e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-05-14 18:07:15 +02:00
Friedemann Kleint
ffbbf64e29 Clean headers in QML-Designer. 
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I8a2e9e35980198fc4162623db044c228bd209a0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-30 14:09:58 +02:00
Marco Bubke
ff4457bb46 QmlDesigner: Prepare for other layout items 
Change-Id: I831e68877eb3d785b4bbb99db002ab8e42158d75
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-22 17:03:37 +02:00
Marco Bubke
95da38c5b0 QmlDesigner.FormEditor: Add instancePropertyChange to tools 
Change-Id: Ibd2e30f97117ec2c20240e115e57f387fd220686
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 0edde8f83e)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-25 13:46:57 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Marco Bubke
8d9710c074 Refactoring document handling 
The document handling in the qml designer was complicated source
code, which was initially intended for a non creator application.
To integrate new views it has to be changed and cleaned up. This
is the first major step in that direction.

Change-Id: Ie26f0aad7a03946d18bdb4c0759b246c5439d922
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2013-01-23 14:53:28 +01:00
Orgad Shaneh
a44aa55502 Add whitespace after control keywords 
find -name \*.cpp -o -name \*.h | \
  xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'

Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-28 20:20:46 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug 
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-06 14:55:08 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Thomas Hartmann
f184ced2e1 QmlDesigner.formEditor: use pure virtuel instead of assert 
Asserting because of unexpected mouse events is evil.

Task-number: QTCREATORBUG-6042
Change-Id: Idc21b1cb6bfebead4eab80f6526235164b3f8d54
Reviewed-on: http://codereview.qt-project.org/5090
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-16 14:38:47 +02:00
Thomas Hartmann
3cfa376243 QmlDesigner: Fix wrong position for reparenting 
Change-Id: Ie9d9a739e559d5cfc06849ff3e5c086e9ab2224c
DoneBy: Marco Bubke
Task-number: QTCREATORBUG-3962
Reviewed-on: http://codereview.qt.nokia.com/958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 17:36:09 +02:00
Marco Bubke
4ae6c1da95 QmlDesigner.FormEditor: Fix cursor handling 
Change-Id: I533642ebf5d3937f96b248d7f999eb4928e035e9
Reviewed-on: http://codereview.qt.nokia.com/911
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-29 16:33:32 +02:00
Thomas Hartmann
d7ed0667e9 QmlDesigner.formeEditor: add handler for context menu 
This patch adds a handler for a context menu to AbstactFormEditorTool.
Also all the tools are patched to ignore right mouse keys for now.

The ResizeManipulator gets an active property.

Change-Id: I66b247ce6ae8e9f88517a1c1698432fb64f70da7
Reviewed-on: http://codereview.qt.nokia.com/770
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-27 16:22:02 +02:00
Thomas Hartmann
df6f809927 QmlDesigner: allow aborting drag and drop with Escape 
Also allows aborting the move tool.

Reviewed-by: Marco Bubke
Task-number: QTCREATORBUG-4322
 2011-05-10 15:11:19 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Marco Bubke
acb36acf15 QmlDesigner.FormEditor: Change to component for double click 2011-02-02 13:42:09 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Thomas Hartmann
594ba6339b fixes warnings 2010-12-16 17:47:55 +01:00
Thomas Hartmann
d6a2e2ffef QmlDesigner.formEditor: wire up instancesCompleted() to tools 2010-12-10 22:46:18 +01:00
Marco Bubke
95bec64403 QmlDesigner.Model: removing unused code (ModelUtilities) 
ModelUtilities are not used anymore.
 2010-11-24 15:52:22 +01:00
Marco Bubke
45bdff449d QmlDesigner: Items in Positioner cannot manipulated anymore 
Add a positioner node instance and the concept of resizable and movable
items. Item in a positioner will be not selected anymore. Instead their
positioner will be selected which is not resizable.
 2010-09-29 13:54:27 +02:00
Marco Bubke
d2b3258e59 QmlDesigner.FormEditor: Test if a qml item is valid to prevent crashes 2010-09-24 09:10:46 +02:00