feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
25,018 Commits 108 Branches 368 Tags
156bfd2e7f0711c4ca8b3323e390011f93cd5da6
Commit Graph

37 Commits

Author SHA1 Message Date
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
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01: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
Morten Johan Sorvig
b0cd54c1ec Replace Q_WS_MAC with Q_OS_MAC. 
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.

This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)

Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-26 11:06:12 +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
hjk
5295e05310 minor style 
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:24:14 +02:00
Marco Bubke
f6f6045153 QmlDesigner.NodeInstances: Fix frame dropping for last frame 
Change-Id: Ie8c66c55f0236043441043727f31c9040a5dfc3d
Reviewed-on: http://codereview.qt.nokia.com/4008
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:46 +02:00
Marco Bubke
754b993c36 QmlDesigner.NodeInstances: Add version to puppet 
Change-Id: Id101295520418975a4f569f57709875d7213e9bf
Reviewed-on: http://codereview.qt.nokia.com/2304
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-28 10:14:53 +02:00
Marco Bubke
8870c86ad5 QmlDesigner.NodeInstance: Update the screen object if the root item size changed 
Change-Id: Ifc06131f4a57a30ab9b20687372150b23c8416cb
Reviewed-on: http://codereview.qt.nokia.com/2285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 15:18:43 +02:00
Marco Bubke
d1b3b66d5a QmlDesigner: Fix positioner handling 
Change-Id: I519bbbfee939d4568a0de5bbe5c01912a08c6fb1
Reviewed-on: http://codereview.qt.nokia.com/1848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-20 13:06:12 +02:00
Marco Bubke
a060480e82 QmlDesigner.NodeInstances: Item with content are selectable 
If a list view for example has content it is now selectable too.

Task-number: QTCREATORBUG-5476
Change-Id: Ifb0902edcda064e488337c94fc4e575994da3ef1
Reviewed-on: http://codereview.qt.nokia.com/1786
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-19 10:47:36 +02:00
Marco Bubke
8f826aa5f7 QmlDesigner.NodeInstances: Add workaround for simulator Qt 
Task-number: QTCREATORBUG-5408

Change-Id: I7abcc36102421d07dfc044355ff70833bf93d84b
Reviewed-on: http://codereview.qt.nokia.com/1678
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-15 10:45:10 +02:00
Marco Bubke
8a5fffb945 QmlDesigner.NodeInstances: Fix restore bindings for reset 
Task-number: QTCREATORBUG-5415

Change-Id: I1cbc8dda5eb1512db52a2767837b53eb136dc387
Reviewed-on: http://codereview.qt.nokia.com/1664
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 16:53:08 +02:00
Thomas Hartmann
44886dcde1 compile fix 
Change-Id: I2c720a42c63856b62d14fc01239a2c12110328be
Reviewed-on: http://codereview.qt.nokia.com/1665
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-07-14 14:43:42 +02:00
Thomas Hartmann
80909210b1 QmlDesigner.instances: ignore infinite/huge bounding rects 
There are cases with infinite/huge bounding rects. We ignore those.

Change-Id: If9a55bef91ab5aec4736c579131f4edf10768469
Reviewed-on: http://codereview.qt.nokia.com/1660
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 14:35:51 +02:00
Marco Bubke
01eece3d84 QmlDesigner: Fix state switching 
Task-number: QTCREATORBUG-4062

Change-Id: I2a04c5a04ef40390772fe46f587bc60c02a4bab1
Reviewed-on: http://codereview.qt.nokia.com/1605
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-13 18:42:47 +02:00
Thomas Hartmann
9b9f1a8267 QmlDesigner: do not show icons on Mac 
This fixes a regression. $$PWD was missing.

Change-Id: I579b1e22fd790280c5d87b6e59e11320fdb1a2af
Reviewed-on: http://codereview.qt.nokia.com/1538
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-12 16:59:26 +02:00
Marco Bubke
2ebb5137a0 QmlDesigner.NodeInstances: Wouraround invisible root items 
Task-number: QTCREATORBUG-5152

Change-Id: I40be95844598a3a3728d0c7fbe88a9fe7a155c53
Reviewed-on: http://codereview.qt.nokia.com/1532
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-12 16:11:07 +02:00
Marco Bubke
668bfe69de QmlDesigner.NodeInstances: Fix workaround 
componentComplete after reparent was null.

Change-Id: Ic4705531a38f67e706bc58a27d423d4062f83304
Reviewed-on: http://codereview.qt.nokia.com/1425
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-11 16:30:53 +02:00
Marco Bubke
4cdfacff11 QmlDesigner.NodeInstances: Fix component complete 
Task-number: QTCREATORBUG-5338

Change-Id: Iaaaf2cd5440fa8d2f7baae8c42b9234d231a45aa
Reviewed-on: http://codereview.qt.nokia.com/1322
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-07 16:32:39 +02:00
Marco Bubke
25daed2f03 QmlDesigner: Fix wrong position for reparenting 
Task-number: QTCREATORBUG-3962

Change-Id: Id583e257aa1c1645cb53a8ae32f83717df9b0617
Reviewed-on: http://codereview.qt.nokia.com/926
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-07 15:00:23 +02:00
Marco Bubke
862bc044df QmlDesigner.NodeInstances: Workaround qml design bug 
Task-number: QTCREATORBUG-5005

Change-Id: Ia0f1f30a04818bc6ee55a0822eaf0d2b0183e50d
Reviewed-on: http://codereview.qt.nokia.com/1252
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-07 13:39:12 +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
Thomas Murach
a4c4d67772 corrected license headers 
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
 2011-07-06 17:56:15 +02:00
Marco Bubke
7d4194d97b QmlDesigner.NodeInstances: Fix no dummydata 
Task-number: QTCREATORBUG-5296

Change-Id: Ia640e03a4a70f15001ab7476713677c52b964cf8
Reviewed-on: http://codereview.qt.nokia.com/1236
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-06 15:45:16 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +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
a49b85eac5 QmlDesigner.NodeInstances: Return the implicit size if the size is invalid 
Task-number: QTCREATORBUG-5240

Change-Id: Ie8be3a2cc728805411a79c1f216ede566c641c17
Reviewed-on: http://codereview.qt.nokia.com/925
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 10:50:22 +02:00
Marco Bubke
bc6879cbc8 QmlDesigner.NodeInstances: Positioners are resizable again 
Task-number: QTCREATORBUG-5242

Change-Id: I6f481dc4e9705e0ebdc8f30761afc0c4fc7f2849
Reviewed-on: http://codereview.qt.nokia.com/915
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 10:50:00 +02:00
Thomas Hartmann
16975727b8 QmlDesigner.qmlPuppet: SetErrorMode only if breakpad is disabled 
Change-Id: Ibe0ded2855dc0fe63f0867d953f501c8a025210b
Reviewed-on: http://codereview.qt.nokia.com/912
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-29 17:09:23 +02:00
Marco Bubke
f7f85b797e QmlDesigner: Fix root item is resizable and movalbe 
Change-Id: I3e9e8d0ecd89040b01bcfabc8d6567411567e7e2
Reviewed-on: http://codereview.qt.nokia.com/910
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-29 16:32:40 +02:00
Thomas Hartmann
11d4cbc141 QmlDesigner.NodeInstances: Fix that scene tranform isn't updated 
This change has to go to 2.3

Change-Id: I5d3ebfbff2df8129e5f6678e877c641e0ea926cb
Reviewed-on: http://codereview.qt.nokia.com/887
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-29 12:01:19 +02:00
Marco Bubke
6c2a84a736 QmlDesigner.NodeInstances: Fix repaint bug 
The dirtySceneTransform flag isn't reset by resetDirtyItem(). So we do it now
manually.

Change-Id: I2a908c18b2e05e9b6f40dc2994e765c37197a6d5
Reviewed-on: http://codereview.qt.nokia.com/848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 17:40:36 +02:00
Marco Bubke
ddb602536c QmlDesigner: Fix painted bounding rectangle for step childs 
We used only the bounding rectangle of the item under our control. But child
items which are created in a component can be out side of the bounding
rectangle. To fix compute a combined bounding rectangle of the item and all
stepchildren. Stepchildren described the child not create directly by us.

Change-Id: I7f25f112aa5eb2f80cfccec5d358221ab5e35d9b
Reviewed-on: http://codereview.qt.nokia.com/839
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 16:26:26 +02:00
Marco Bubke
0fcc6afd8f QmlDesigner: Split between bounding rectangle and painted bounding rectangle 
In qml the interactive bounding rectangle is always
QRectF(0, 0, width, height). The painted bounding rectangle can differ from
this logical one. This change is much more near to the qml description.

Change-Id: I139cb70512fa1ed003b28ca2ae512f4e33e915e5
Reviewed-on: http://codereview.qt.nokia.com/812
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 10:25:10 +02:00
Marco Bubke
52dcd28275 QmlDesigner.NodeInstances: Reduce repaints 
Change-Id: I39e7eae1036ee79689ccd49bfe900fee93a3454b
Reviewed-on: http://codereview.qt.nokia.com/808
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-27 21:34:42 +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