feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,477 Commits 108 Branches 368 Tags
820223a8f55dfdda27bd1e4393aefa902ed72a67
Commit Graph

22 Commits

Author SHA1 Message Date
Nikolai Kosjar
69fc3cf03f Kill ";;" at end of statement 
Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-09-04 09:19:10 +02:00
Marco Bubke
04f29127a1 QmlDesigner: Fix transformation bug for tab widgets 
Change-Id: Idc33ddf04f0b6fc317aeb5ed72fd7164ba174ab4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-08-15 15:51:02 +02:00
Marco Bubke
b97422b710 QmlDesigner: Add container item support in node instances 
Change-Id: I30e0d11346b8c63188d052b46656e7ede179e55d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-05-30 14:11:57 +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
40b62e1cfa QmlDesigner: Add GraphicalNodeInstance as abstraction for item and window 
Change-Id: Icaba711464f672a3bfbb9d83a449d47e72ba11ff
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-22 17:03:23 +02:00
Marco Bubke
2b698e31ed QmlDesigner: Add override to qml2puppet 
Change-Id: Ibdf07c4a35b40f3fc78300a1675270f8295bec42
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-16 16:52:20 +02:00
Marco Bubke
359ef53280 QmlDesigner: Move implementation code in the node instances 
updateDirtyNodeRecursive and renderPreviewImage belongs to quick image and
not in the node instance server.

Change-Id: I629b89c748036c0614e78bcfa0c837cb16ca6374
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-15 13:53:53 +02:00
Thomas Hartmann
7406761f8f QmlDesigner.Instances: disabling the cursor after completing 
The cursor should be disabled after component complete.

Change-Id: I3ee089b23f43b42a478aaacc4073cbdfd0da2323
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-04-11 12:11:14 +02:00
Thomas Hartmann
f42f73492f QmlDesigner.Instances: function should be static 
No reason the export the symbol.

Change-Id: I34a42f866333585774129021777265e8a7524555
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-04-11 12:10:58 +02:00
Thomas Hartmann
d204ee0b43 QmlDesigner: Type of the propertyname is now PropertyName 
And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.

Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit ee4bf638ca)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-25 13:35:11 +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
Orgad Shaneh
6e7b51f941 Qml2Puppet: Fix compilation with qtdeclarative master 
e0cb13a5 - Move no-Gui related QML types from QtQuick into QtQml
55f6a109 - Renamed QQuickItem::pos property to position

Fix some warnings

Change-Id: Iec9fe3f543f900a177d55c5de3a636bb296cbc49
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-12-10 11:27:46 +01:00
Marco Bubke
7ef1f9d124 QmlDesigner.NodeInstances: Deactivate componentComplete in VME 
Change-Id: I18c80e0a6d3206ff863b0466d43375fdb64a6b80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 16:11:22 +01:00
Marco Bubke
1600f55f62 QmlDesigner.NodeInstances: Disable text cursor 
Change-Id: Ib27752624d658096903dc3b2660f2ee199d7869e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 15:23:20 +01:00
Marco Bubke
1da50de19c QmlDesigner.NodeInstances: Improve matrix transformation 
Compute the matrix to the instance parent instead of the item parent.

Change-Id: I48be1b2be4b2a0db44a6d464751d591df51507fd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-23 11:16:24 +02:00
Marco Bubke
6994079f96 QmlDesigner.NodeInstance: Better content check 
Fix rendering bug for repeaters.

Change-Id: I1c56bb63ff91cd8f58e349b0f8b038d1dd7d40e9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-23 10:44:51 +02:00
Marco Bubke
139f564599 QmlDesigner.NodeInstances: Fix node updating 
Change-Id: I2aebcaf618251b85764712be7dd5dc3c863c3ba9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-15 16:31:47 +02:00
Thomas Hartmann
c76ddfc489 QmlDesigner.Instances: crash fix 
During destruction both new parent and old parent are invalid.
The intPositioner flag is not updated (isInPositioner()) and we crash.
The check for parentInstance() avoids this.

Change-Id: I5224c58bb461956f7ce2c47349650913975aa836
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-15 14:35:27 +02: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
Marco Bubke
a19495ba20 QmlDesigner.NodeInsatnces: Update positioner if binding is changing 
Only if the expression of the binding is changing.

Change-Id: Ief702082dff0ac473c8ade6f3fc0f0cf36e017f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-04 19:20:06 +02:00
Marco Bubke
fb276230fe QmlDesigner.NodeInstances: Recover positioner support 
Change-Id: Ib5e891a8563bfced2af93e4a516ef8f196e8ff1e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-04 19:19:02 +02:00
Marco Bubke
2fc24f27d1 QmlDesigner.NodeInstances: Rename SG to Quick 
Change-Id: I2180704df244a715a078385a7ecbf852f41ca68f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-26 18:22:19 +02:00