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

485 Commits

Author SHA1 Message Date
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
Kai Koehne
8cd370e163 Debugger: Fix JS debugging on Harmattan PR1.2 
So far we assumend that the JSDebugAgent service switches to
the Enabled state after the constructor has run. That's apparently
not true for Harmattan PR1.2 (maybe the app / Qt calls process
events by hand, maybe it was a race condition from the start).

Fix this by checking the status already in the constructor, and
register ourselves as debugger agent if status == Enabled.

Change-Id: Icae189102116c8b572e05ce6c64f14b8f428ed2f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-01-24 15:37:13 +01:00
Christian Kamm
38d90e58d0 qmldump: Fix dumping empty names for generated QMetaObjects. 
Task-number: QTCREATORBUG-6543
Reviewed-by: Roberto Raggi
Change-Id: I81af457eed14a2f863a0a92d4f5ff69c2dc48d67
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-11-17 13:54:11 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Christian Kamm
a037609c3f qmldump: Add a flush to fix output redirection problems on windows. 
Task-number: QTCREATORBUG-5825
Change-Id: Ib086e8ed213738516015334736b1a2badb202993
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-03 11:17:04 +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
Pawel Polanski
a558cedcd0 Symbian: A typo while including QmlJSDebugger library 
Case sensitive systems do not recognise the library

Change-Id: I59d296a3bc38669bb2dc58e0bafeafe792e41543
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-31 13:51:24 +01:00
Eike Ziller
5dbe570f9c Fix licenses. 
Change-Id: I834bc5da86c97ddaeefb43011444da8ed0e85180
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-18 17:41:23 +02:00
Thomas Hartmann
d74a866bc6 QmlDesigner.instances: support for QMLDESIGNER_RC_PATHS 
Allows using qml files referencing qrc resources in the designer.

Change-Id: I8a3ae9c5a0fb38c47505cc606609acb41f648bbc
Reviewed-on: http://codereview.qt-project.org/6075
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-05 17:17:48 +02:00
Thomas Hartmann
e2e69d3e72 QmlDesigner.instances: create working stand-in object 
Create an Item as stand-in.

Change-Id: Ic6521bcade216bbb04679eabd909d2eec3d8a366
Reviewed-on: http://codereview.qt-project.org/6076
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-05 17:15:02 +02: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
Thomas Hartmann
8e9da5f797 QmlDesigner.instances: support for auxiliaryData @NodeInstance 
This allows overwriting values in node instances only.

Change-Id: I596323a9ebc112033c9811a8aaf35fed371cb867
Reviewed-on: http://codereview.qt-project.org/4924
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-09-20 09:42:42 +02: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
9837dadbcb QmlDesigner.NodeInstances: Refactor isManipulatable to isChangeable 
Change-Id: Icfc508e1549f4cfbcdda09b4611b2d66b4e2de1d
Reviewed-on: http://codereview.qt.nokia.com/4287
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-06 18:07:55 +02:00
Marco Bubke
387eebf4e9 QmlDesigner.NodeInstances: Render only items with content 
Change-Id: I9f17f369816763b2ac983d557d6bcaa723a28139
Reviewed-on: http://codereview.qt.nokia.com/4286
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-06 18:07:37 +02:00
Marco Bubke
65f5c42bc5 QmlDesigner.NodeInstances: Fix reparent bug 
Change-Id: I4a05ddc9e28e02aa9b9a8f602b3726fc53743245
Reviewed-on: http://codereview.qt.nokia.com/4101
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-05 15:17:14 +02:00
Marco Bubke
ed842542a5 QmlDesigner.NodeInstances: Fix crash for dot properties 
Change-Id: I5fcecd6fb1e50220053b2769e549f62203f33a06
Reviewed-on: http://codereview.qt.nokia.com/4075
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-01 19:53:04 +02:00
Christian Kamm
2da3219909 qmlpuppet: Fix build with Qt 4.7.4. 
Change-Id: I74f0784d76f8fa7137db22a251deaab9d99481dd
Reviewed-on: http://codereview.qt.nokia.com/4040
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-01 09:23:30 +02:00
Marco Bubke
7fa9e52d70 QmlDesigner.NodeInstances: Create effect items only in the render process 
Change-Id: I0506bf898582ba8e26a22f51737eae4d82f06c63
Reviewed-on: http://codereview.qt.nokia.com/4004
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:50:04 +02:00
Marco Bubke
d9b10dca48 QmlDesigner.NodeInstances: Fix header 
Change-Id: Ib272d772f6e8838b71c6ede8222acae4313ecae2
Reviewed-on: http://codereview.qt.nokia.com/4009
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:52 +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
3937a20f18 QmlDesigner.NodeInstances: Fix frame dropping for last frame 
Change-Id: Id70b1bc0af09293628fe2242f4bebeb30c1ae230
Reviewed-on: http://codereview.qt.nokia.com/4007
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:39 +02:00
Marco Bubke
c13624fb2f QmlDesigner.NodeInstances: Preview images for Qml2 
Change-Id: I00ba96458ab8cb2e9d9766e1ecfeaea15bf2e040
Reviewed-on: http://codereview.qt.nokia.com/4006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:32 +02:00
Marco Bubke
cafc2a6c84 QmlDesigner.NodeInstances: Add sgitem getter to the server node instance 
Change-Id: I58baee2a8e59f2cef8add0472a3ee0c2a13fd59a
Reviewed-on: http://codereview.qt.nokia.com/4005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:26 +02:00
Marco Bubke
432a36283f QmlDesigner.NodeInstances: Use v8 private headers 
Change-Id: I4c0d8e08a22ee0c5b2602cc7d877071010fd9f88
Reviewed-on: http://codereview.qt.nokia.com/3976
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:18 +02:00
Marco Bubke
abc3a9b716 QmlDesigner.NodeInstances: Provide bounding rectangle for render image 
Change-Id: If1d8e51109eec5e281a1cecdaff7c081a5e6d95d
Reviewed-on: http://codereview.qt.nokia.com/3975
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:12 +02:00
Marco Bubke
bb0900d668 QmlDesigner.NodeInstances: Refactoring dirty to isDirty 
Change-Id: I6344632a8570ad09e38c7d3dc093c42d758bf15a
Reviewed-on: http://codereview.qt.nokia.com/3974
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:06 +02:00
Marco Bubke
1e60fbfba4 QmlDesigner.NodeInstances: Add support for new list interface 
Change-Id: Icd20f2a921c94f8bac73f9f61b61a34561ee2d3f
Reviewed-on: http://codereview.qt.nokia.com/3973
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:01 +02:00
Marco Bubke
9250b611c8 QmlDesigner.NodeInstances: Fix image rendering 
Call DesignerSupport::updateDirtyNode() recursively for every item which is
not under our control.

Change-Id: Ie6c784965d1557ece81176fc405864f1328733f7
Reviewed-on: http://codereview.qt.nokia.com/3972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:55 +02:00
Marco Bubke
50d1087a94 QmlDesinger.NodeInstances: Fix bounding rectangle calculation 
Change-Id: Ia0633416e50da68377a781050e301e5721540d6b
Reviewed-on: http://codereview.qt.nokia.com/3971
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:49 +02:00
Marco Bubke
1e1e4b4f70 QmlDesigner.NodeInstances: Fix function call to parent class 
Change-Id: I4842b91c53b3d9f0b0bc6a950858ce482b173d1b
Reviewed-on: http://codereview.qt.nokia.com/3970
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:42 +02:00
Marco Bubke
b8592f1b98 QmlDesigner.NodeInstances: Remove unused code 
Change-Id: Ibf585ef6f821f73be16888fea550bfe0e0b1bcd6
Reviewed-on: http://codereview.qt.nokia.com/3969
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:36 +02:00
Marco Bubke
ebf7c68705 QmlDesigner.NodeInstances: Remove Qt5 guards 
Change-Id: Ia740b2818dcc287ff82991ae317bcf644c4c0c2a
Reviewed-on: http://codereview.qt.nokia.com/3968
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:23 +02:00
Marco Bubke
991e75d65b QmlDesigner.NodeInstances: Improve SceneGraph support 
Change-Id: Ia5111f972836a1123fe857511325a82aef855449
Reviewed-on: http://codereview.qt.nokia.com/3967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:04 +02:00
Kai Koehne
a78347e102 QmlJSDebugger: Remove unused toolbar 
This got disabled ages ago, but we never cleaned up the sources.

Change-Id: I3d172708002627c29816a6dc1e68b19b15fda372
Reviewed-on: http://codereview.qt.nokia.com/2776
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-08-11 10:19:03 +02:00
Eike Ziller
99ba300ae3 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
 2011-08-10 16:03:57 +02:00
Kai Koehne
c42e966184 JSDebugger: Only hit breakpoints in user code 
Check that the topmost stack entry is a user defined ScriptFunction.
This avoids hitting the anonymous functions used for bindings, e.g.

onClicked: Qt.quit()

leads to script code

(function onClicked() { Qt.quit(); })

which will be hit twice for the debugger: Once for the function call
itself, then for the execution of Qt.quit().

Change-Id: I4cb374782c93a26d97d4a717ce67d1fb2f6df438
Task-number: QTCREATORBUG-5090
Reviewed-on: http://codereview.qt.nokia.com/2746
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-08-08 16:31:44 +02:00
Marco Bubke
26fbb50dc2 QmlDesigner.NodeInstances: Show binding in text if invalid 
If a binding on a text property cannot be evaluated it will now will be
show as #binding.text#

Change-Id: Ib1d5f406724b262833215d30ec0966a75f9dc971
Reviewed-on: http://codereview.qt.nokia.com/2452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-02 10:22:34 +02:00
Oswald Buddenhagen
65c0eb5165 Merge branch '2.3' 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
 2011-07-29 17:57:59 +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
776f19025e QmlDesigner.NodeInstances: Add a default dummy context 
Task-number: QTCREATORBUG-5631

Change-Id: Id1ba102d6992b8a56b105c061be89677e13e9a8b
Reviewed-on: http://codereview.qt.nokia.com/2300
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 20:14:24 +02:00
Marco Bubke
2125638107 QmlDesigner.NodeInstances: Move context object to a context directory 
filename_contextdummy.qml -> context/filename.qml

Task-number: QTCREATORBUG-5630
Change-Id: I76ae5432ff3052d17a3cec17d85b5cbb6d1ddc61
Reviewed-on: http://codereview.qt.nokia.com/2295
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 20:14:14 +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
e4286b7dc2 QmlDesigner.NodeInstance: Reset items if the aux size is invalid 
Change-Id: Ic5c8aa1a622b6e7d446bb1416038571b0b591f54
Reviewed-on: http://codereview.qt.nokia.com/2284
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 15:18:36 +02:00
Kai Koehne
84743eff46 QmlJSLib: Fix linker errors with gcce 
usrt2_2.lib is passed to g++ before QmlJSDebugger.lib, which results
in errors about __aeabi_atexit, __dso_handle being undefined. Work around
this by explicitly adding usrt2_2.lib again after QmlJSDebugger.lib.

Task-number: QTCREATORBUG-5556
Change-Id: Id9e1dc19a2ee54e59d92470a35ccfd4946b07dcc
Reviewed-on: http://codereview.qt.nokia.com/2115
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-25 16:42:17 +02:00
Kai Koehne
0ec8817cbe QmlDbgHelper: Fix compilation for Symbian target in SDK 
The Symbian3Qt473 folder in the SDK contains a .qmake.cache
with invalid QMAKE_MOC path. Override this in the .pro file.
Also make sure that the .prl file is generated (create_prl was
set in the .qmake.cache)

Change-Id: Ibf905b4d9a8addf1b45a2ee40acdd0134da30e11
Reviewed-on: http://codereview.qt.nokia.com/1977
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-25 15:46:37 +02:00
Oswald Buddenhagen
ae8ac2eb2f Merge branch '2.3' 
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
 2011-07-25 13:57:13 +02:00
Marco Bubke
f9a3fd338c QmlDesigner.NodeInstances: Reparent after value setting 
Change-Id: I06ac27d5043ab7f102972f0c054fc55fc77f6b15
Reviewed-on: http://codereview.qt.nokia.com/1994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 18:59:40 +02:00
Marco Bubke
c6a7091c8a QmlDesigner.NodeInstances: Fix line feed handling 
Task-number: QTCREATORBUG-4161

Change-Id: I61d765bedffde4d1f15e763d92b771f22dbcd4a2
Reviewed-on: http://codereview.qt.nokia.com/1849
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-20 13:06:18 +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