feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,609 Commits 108 Branches 368 Tags
e013c7e6516da81557f2c9b51b366aa099e7ed65
Commit Graph

58 Commits

Author SHA1 Message Date
Thomas Hartmann
626364f661 QmlDesigner.DragTool: Remove import handling code 
We have an import manager now.

Change-Id: If0123059a0fa1b51ef91c13bf24e3e6998195880
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-07 13:45:17 +02:00
hjk
7ed339248a QmlDesigner: Consolidate exception handling code 
And translate the message box title.

Change-Id: I9d805c10940e5e3dbaa17323a913a4a55fc61a2d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-03-12 12:37:00 +01:00
hjk
3b84a6dc88 Use ICore::dialogParent for message boxes without parent so far 
Change-Id: I2ee35796b2c041e6ea2ae6bd677e10167451d1b8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-03-12 12:06:10 +01:00
Marco Bubke
b6ea314a55 QmlDesigner: Don't drop anymore in a layoutable 
The behavior to drop something in a layoutable is quite strange because
we don't support visual layouting at all.

Task-number: QTCREATORBUG-11543
Change-Id: I4d455d3a6f099edfeacbdb0def2e9e9c4489768c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-03-06 15:34:08 +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
f97df3e970 QmlDesigner: Add RewriterTransaction tracing framework 
Change-Id: I6c152e128e0a1b1d4450bbba81e47d072aac3038
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-01-06 14:42:22 +01:00
Thomas Hartmann
50ed6fbb2b QmlDesigner.DragTool: refactor committing of transaction 
I created commitTransaction() which is called whenever we change
to the selection tool.

Task-number: QTCREATORBUG-11134

Change-Id: I1b98c8ff45864decd36f24b219f7d952e44de8fc
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-01-02 16:02:26 +01:00
Marco Bubke
1fd9707dbb QmlDesigner: Remove QmlModelView::createQmlItemNode functions 
Change-Id: I5c3f05beec22f056daa3419fac40ef837a655a8d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-31 12:12:21 +02:00
Marco Bubke
ff9e7a00c7 QmlDesigner: Remove qml function in the QmlModelView 
Change-Id: I94748c9fad017038d61ff5a231a8e5f081985cc0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 17:26:00 +02:00
Marco Bubke
4a28da1e7e QmlDesigner: Increase time out at item creation 
Change-Id: Ie077d4a6d322515188a125b520a58b6e98deb2fd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-06-06 16:25:20 +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
0edde8f83e QmlDesigner.FormEditor: Add instancePropertyChange to tools 
Change-Id: Ibd2e30f97117ec2c20240e115e57f387fd220686
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-03-18 16:46:13 +01:00
Thomas Hartmann
54431a090c QmlDesigner.AbstractView: remove widget() 
We use now widgetInfo() instead.

Change-Id: Icaea8f012b380368b6479fa81d370236ea5a6781
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-14 16:50:31 +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
Orgad Shaneh
29a93998df Remove braces for single lines of conditions 
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-08 10:48:18 +01:00
Thomas Hartmann
64da60dcd3 QmlDesigner.DragTool: fixing creating file imports 
Creating file imports from the item library was broken.
If the version is -1.-1 we have to create a FileImport
instead of a library import.

Change-Id: I6bef68ba308d2254c9c2cb607a91c81055a360d4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-12-20 17:08:19 +01:00
Orgad Shaneh
3747e941ad Clean up whitespace before EOL 
Change-Id: I385544a10b9be66589b0d1a48594128035836c8a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-28 20:17:51 +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
d853997f99 QmlDesigner.dragAndDrop: crash fix 
This fixes a crash if we drag in complex items with children.

Change-Id: I0e924d3130cbd43dc9a20469576dce8a0f67f3df
Reviewed-on: http://codereview.qt.nokia.com/1715
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-15 18:33:13 +02:00
Thomas Hartmann
c90ada79d9 QmlDesigner.itemLibrary: use utf8 for filenames (not latin1) 
Task-number: QTCREATORBUG-4617
Change-Id: I6ff20816aa2800d4465a99ee69bdd871e6186a57
Reviewed-on: http://codereview.qt.nokia.com/1511
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-12 12:07:59 +02:00
Thomas Hartmann
a89390342f QmlDesigner.dragTool: improve usablity of drag and drop 
If the parent is not set yet we do not need to reparent, yet.

Change-Id: I2ad743e775ebac57dde1b3600ff6af6378fc9da2
Reviewed-on: http://codereview.qt.nokia.com/1408
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-11 16:12:57 +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
Thomas Hartmann
cd7f466bb0 QmlDesigner.model: fixing checking for imports 
Change-Id: I878f429c94b75c229738dfc26806e29a5673b102
Reviewed-on: http://codereview.qt.nokia.com/955
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 17:21:12 +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
9b93ac78f8 QmlDesigner: using hasImport 
This change avoids adding an import if the same import with different alias
already exists.
 2011-05-16 16:20:05 +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
Thomas Hartmann
7df99bca7d QmlDesigner.dragTool: behaivour/usabilty fix 
The user should be able to drop an item everywhere, also outside
the root item. The item is created in the scene when the animation is over.
Also the animation is shorter now.
 2011-03-08 18:38:09 +01:00
Marco Bubke
e3376b6d8d QmlDesigner: Change importAdded and importRemoved in importsChanged 2011-02-10 15:58:03 +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
bb3ff9c66c QmlDesigner.dragAndDrop: use instancesCompleted instead of timer 2010-12-10 23:04:02 +01:00
Thomas Hartmann
d6a2e2ffef QmlDesigner.formEditor: wire up instancesCompleted() to tools 2010-12-10 22:46:18 +01:00
Thomas Hartmann
3f283dbc44 QmlDesigner.dragAndDrop: properly add imports 
Imports have to be added before transaction starts.
 2010-12-09 16:43:50 +01:00
Thomas Hartmann
272414309c QmlDesigner.dragAndDrop: crashfix 
dragNode might be invalid!
 2010-12-09 16:43:50 +01:00
Thomas Hartmann
de96223b76 QmlDesigner.dragAndDrop: optimize drag and drop behaivour 
We select now after the drop event.
Some fixes for the out of process stuff.
 2010-12-08 17:10:13 +01:00
Thomas Hartmann
b39be67c4b QmlDesigner.dragAndDrop: fix 
This is just a hotfix. We have to find a way to properly
sync with the out of process node instances.
 2010-12-06 17:46:34 +01:00
Marco Bubke
95bec64403 QmlDesigner.Model: removing unused code (ModelUtilities) 
ModelUtilities are not used anymore.
 2010-11-24 15:52:22 +01:00
Thomas Hartmann
5873083768 QmlDesigner.dragAndDrop: this avoids asserts for unknown types 
This avoids asserts and catches exceptions
 2010-09-24 13:46:11 +02:00
Marco Bubke
6ce6dfbd2a If you move a new item on the formeditor the item is always in the base 
state

The position is now setted int the base state if you drop a item on the
formeditor and move it around.

Task-Number: BAUHAUS-644
Reviewed-by: kkoehne
 2010-05-31 11:02:38 +02:00
Thomas Hartmann
76362232b6 QmlDesigner.DragAndDrop: avoid flicker 
Task-number: BAUHAUS-448
 2010-05-18 17:11:06 +02:00