feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
32,407 Commits 108 Branches 368 Tags
b42a1b5918bc8045c4805d9dd4ad371793827e3c
Commit Graph

20 Commits

Author SHA1 Message Date
hjk
c68e90ec5c QmlPuppet: save a few function calls 
Change-Id: Ic73b8bb417c2bf40af6146fe781c206266d3ecf8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-09-11 10:49:54 +02:00
Orgad Shaneh
ad9e7ccab6 Fix coding style for else statements 
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-17 11:11:25 +02:00
Marco Bubke
0ba2b9b37d QmlDesigner: Add qdebugs for commands 
Change-Id: I60bdd5b36749be5092d4dabe486b101d62b3df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-16 17:04:31 +02:00
Marco Bubke
8f22b84016 QmlDesigner: Fix the exit for qml puppet 
Change-Id: I228e91711f6976e0e6d7b298d73f61cd8c25be23
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-16 17:00:31 +02:00
Marco Bubke
90ce3aec8b QmlDesigner: Test mode for qml puppet streams 
Change-Id: I93128c60892900d6b4728569b84efb0ed835b51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-08 11:28:38 +02: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
4f2ceefeff Add debug output command 
Adds a infrastructure to get text information back to the client.

Change-Id: Ie5b92f875fe4cbd5f5a8e4d60a797efa0e5cbf70
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 14:12:07 +01:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02: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
Thomas Hartmann
ad94d4f09c QmlDesigner: fix warning 
Change-Id: I2addb29b617fc682aa766de9e080323133185093
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-02 17:13:22 +02:00
Marco Bubke
18d34fef04 QmlDesigner.NodeInstances: Share NodeInstanceClientProxy between puppets 
Change-Id: I49ffa49e45d12950150bedfa8452de4c89674ef8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-01 17:10:28 +02:00
Thomas Hartmann
1bfd2a0c1f QmlDesigner.qmlPuppet: set QDataStream version 
We already did some refactoring on this part in master.

Change-Id: Ia878afa3aa773d2496343e052ababf30da9351d7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-27 09:49:37 +02:00
Marco Bubke
f1962c9bd5 QmlDesigner.Instances: Divide qmlpuppet and qml2puppet 
Change-Id: I06be890d22a29790dbd91a0f167b63f055369315
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-19 16:29:53 +02:00
Marco Bubke
ce9b7bf123 QmlDesigner.NodeInstances: Shared memory for value changes 
Change-Id: I3c3455f411f18322a062f144e98461691d12ada8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-11 15:41:41 +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
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
Marco Bubke
80c1e74abd QmlDesigner.NodeInstances: Change Assert in exit 
Change-Id: I9a19ab772db406b0b1e6f9b76b997dcee17bccbf
Reviewed-on: http://codereview.qt-project.org/5244
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 17:06:49 +02:00
Marco Bubke
765ba3b4b9 QmlDesigner: Prevent item hoping for reparenting 
Because of the asynchronous nature of the formeditor the item can be between
to states. This looks like the item is hoping around. To prevent this a token
is sent to the instances and back. For the time frame the painting is disabled.

Change-Id: If7e937cba8171248464ad350bb14438c020b25f9
Reviewed-on: http://codereview.qt.nokia.com/1189
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-06 18:19:28 +02:00
Marco Bubke
8fe3302329 QmlDesigner.NodeInstances: Move qmlpuppet to share 
Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7
Reviewed-on: http://codereview.qt.nokia.com/634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-22 18:24:36 +02:00