Commit Graph

802 Commits

Author SHA1 Message Date
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
Christian Kamm
2c40acbec9 qmldump: Fix dumping with -path on Mac.
If the current working directory was a direct parent of the qmldir path
the exported modules had the path as the module URI on macs.

Also changes the QtQuick export back to 1.0 to make it work with
Qt 4.7.3. The version of that import statement does not actually matter
as long as it's valid.

Change-Id: Ib702356062bd239b1ad807c2592f8a69d6fde38f
Reviewed-on: http://codereview.qt.nokia.com/896
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
(cherry picked from commit dc3e803614)
2011-06-29 15:19:25 +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
Christian Kamm
6244008dcb qmldump: Improve error message for misbehaving plugin components.
Change-Id: I7a7c4e5a0fc241a5cc6cb143df37cc63ea7711ea
Reviewed-on: http://codereview.qt.nokia.com/867
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-06-29 10:05:43 +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
2d4b5fcb65 QmlDesigner: Fix slowness for many items
The information change notifier provided no hint which infotmation changed.
So the property editor has updated the anchors for all information changes.
Now there is a hint and the update is only happen for a anchor change.

Change-Id: I3b6d7546f43bce4c08757662e7af32604a8db56f
Reviewed-on: http://codereview.qt.nokia.com/811
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-28 13:47:56 +02:00
Thomas Hartmann
08e4b339f1 QmlDesigner.instances: allow fallback to item
If we know from the (text editor) meta system that an object is an
(visible) item, we always create an item as fallback.

We might not be able to instaciate the original item.

Change-Id: I6851cd7a8de68d9d09b789927c204f0617017de7
Reviewed-on: http://codereview.qt.nokia.com/829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2011-06-28 13:36:48 +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
Christian Kamm
14a74f336a qmldump: Fix export comparison.
Compare the full uri/name, not just the uri. Also
QDeclarativeType::module was not available in 4.7.3.

Change-Id: I0d04d826c72d4aed5d70c3c65a1f97ad5872827c
Reviewed-on: http://codereview.qt.nokia.com/759
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-06-27 11:41:38 +02:00
Thomas Hartmann
cf39ee315b QmlDesigner.nodeInstances: improving warnings if building qmlpuppet fails
Change-Id: I7dfecd8e0ad0016748ef4513cf0364e8dcd7d121
Reviewed-on: http://codereview.qt.nokia.com/715
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-24 16:19:01 +02:00
Oswald Buddenhagen
1d78e594d8 Merge branch '2.2'
Conflicts:
	qtcreator.pri
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
	src/libs/qmljs/qmljsdocument.cpp
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/libs/qmljs/qmljslink.cpp
	src/plugins/cppeditor/cppquickfixes.cpp
	src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
	src/plugins/qmldesigner/qmldesigner.pro
	src/plugins/qmldesigner/symbianplugin/symbian.metainfo
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617
2011-06-23 19:47:50 +02:00
Christian Kamm
46e970c37c qmldump: Fix for extended objects.
Before, extended objects had the same exports as the base object
which lead to trouble.

Change-Id: Id40f0e0fd2211db95020ce224cf2c52939e68df7
Reviewed-on: http://codereview.qt.nokia.com/642
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-06-23 11:01:15 +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
Christian Kamm
4adaecda27 qmldump: Add -v option.
Change-Id: Ia55bf314c37455647cf67f42222f7b6a483ba97e
Reviewed-on: http://codereview.qt.nokia.com/543
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-06-21 14:07:02 +02:00
Thorbjørn Lindeijer
edca313d53 QmlJSDebugger: Removed leftover connect statement
It was trying to connect a no longer existing signal to a no longer
existing slot.

Change-Id: Ic00553e5792a3687887e8253e8b2552c38448702
Reviewed-on: http://codereview.qt.nokia.com/250
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-31 09:45:09 +02:00
Thorbjørn Lindeijer
92298a5c43 DeclarativeObserver: Don't fade in the highlight edge
It feels more responsive when the highlight is immediately visible.

Change-Id: Ie3dd0693ecc38f33b001c86970b220b45b37fdfc
Reviewed-by: Kai Koehne
(cherry picked from Qt 4.8 commit 0b4e028ec294992df01430bdf978982835c7df5c)
Reviewed-on: http://codereview.qt.nokia.com/248
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-31 09:44:33 +02:00
Thorbjørn Lindeijer
335f6ad0f7 QmlJSInspector: Renamed Observer to Inspector
Manually redid Qt 4.8 commit 206ebd5af21d94c3f3b49d2cb645105a63e6f5fb,
to make future code synchronization easier.

In order not to have to change the QmlApplicationViewer again, a
compatibility class QDeclarativeViewObserver is retained that subclasses
QDeclarativeViewInspector.

Change-Id: Ief87ae2f8f76b1db0c9d65085e4832424b277603
Reviewed-on: http://codereview.qt.nokia.com/242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-31 09:44:09 +02:00
Christian Kamm
715cee76a9 qmldump: Bump to QtQuick.tooling 1.1, make parser more permissive.
The qmltypes file reader now ignores unknown bindings and components
to allow for better forward-compatibility.

Change-Id: I2e31c17344dc8fdcd301a62c8d08e98c29ef53ee
Reviewed-on: http://codereview.qt.nokia.com/202
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-30 11:26:54 +02:00
Christian Kamm
6e32742400 qmldump: Add dumping of 'revision' for Qt >= 4.7.4.
Change-Id: Ib86c771be9540e22b48685eacd29d81056b53588
Reviewed-on: http://codereview.qt.nokia.com/199
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-30 09:28:42 +02:00
Thorbjørn Lindeijer
cf88d6a812 DeclarativeObserver: Fixed duplicates in item selection
Only add items to the current selection that aren't already part of it.

Also removed checking item for null, since it doesn't make sense to
include null pointers in the list of items to select.

Task-number: QTCREATORBUG-3426
Change-Id: I5a365570f87f72665b3382d05ca9937f56e8956b
Reviewed-on: http://codereview.qt.nokia.com/111
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-05-25 14:35:20 +02:00
Thorbjørn Lindeijer
554b8e996b DeclarativeObserver: Removed the SubcomponentEditorTool
This tool made selecting items in your QML app more complicated than
necessary. Now, left-click will always just select the top-most item
under the mouse and right-click will allow you to select any of the
items below.

Also, the highlighted bounding rect now always applies to just one
item, instead of also including the children bounding rect.

Reviewed-by: Kai Koehne
Change-Id: I17b5ab397d951fd68711590469ca6e723a9cb0e6
(backported from Qt 4.8 commit 935472c16fc53ee43e1e680ed0122e6363282a8e)
Reviewed-on: http://codereview.qt.nokia.com/89
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-25 10:14:36 +02:00
Christiaan Janssen
3cf5379380 QmlLivePreview: removing and inserting animations and transitions
Change-Id: Ic776f63f5d7925ac7dfd99be53c10b9af4cb9545
Reviewed-on: http://codereview.qt.nokia.com/75
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-24 13:03:43 +02:00
Thorbjørn Lindeijer
789cbfad6c Fixed crashes in Observer mode related to infinite bounding rects
Bug fixed by avoiding uniting or subtracting QPolygonF with potentially
infinite coordinates.

The LiveSelectionIndicator now uses a QGraphicsRectItem rather than a
QGraphicsPolygonItem and displays only the boundaries of selected
objects, not including their children.

The SubcomponentMaskLayerItem now works with rectangles and uses a
QRegion to determine the area around the current context, converting
this to a polygon only as a last step.

Reviewed-by: Kai Koehne
Task-number: QTCREATORBUG-4559
Change-Id: I266f5387fa67017fc50215282a95b4ee6498be6d
(cherry-picked from d03065da2999b8539d8c5160b58d56dd94373d6f in Qt 4.8)
2011-05-18 22:22:51 +02:00
Christiaan Janssen
670d241288 QmlLivePreview: adding animations and transitions
Reviewed-by: Kai Koehne
2011-05-17 10:44:33 +02:00
Christiaan Janssen
09a78a3ae7 QmlLivePreview: adding states to an item
Reviewed-by: Kai Koehne
2011-05-17 10:42:45 +02:00
Kai Koehne
fc5bae8837 QmlDebugging: Fix compilation of debugging libs without private headers
Actually use the copy of the private header in the lib. Also fix
the copyright header to a Qt Creator one.
2011-05-16 12:51:55 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Christiaan Janssen
5e164ce1bf QmlDebugger: adding new PropertyChanges on Live Preview
Task-number: QTCREATORBUG-3391

Reviewed-by: Kai Koehne
2011-05-05 17:03:38 +02:00
Kai Koehne
52010b4d95 QmlJsDebug: Don't append 'd' to library name on Unix 2011-05-04 13:08:25 +02:00
Kai Koehne
af9a307c15 QmlJSDebug: Enable compilation of library also for Symbian 2011-04-29 15:08:43 +02:00
Kai Koehne
cc3aa73f5e QmlJSDebugger: Remove stale qmljsdebugger.pri file 2011-04-29 15:08:42 +02:00
Christian Kamm
a448f2b61a QmlDump: Update for changes in qtquick2. 2011-04-28 12:19:16 +02:00
Thomas Hartmann
783779058b QmlDump: fix path import dumps on Windows
Absolute file pathes containing drive identifiers do not work in qml.
(C:\)

workaround: use "." imports and setting the component url.

Reviewed-by: Christian Kamm
(cherry picked from commit 0c8b4e38fa)
2011-04-28 11:14:53 +02:00
Thomas Hartmann
0c8b4e38fa QmlDump: fix path import dumps on Windows
Absolute file pathes containing drive identifiers do not work in qml.
(C:\)

workaround: use "." imports and setting the component url.

Reviewed-by: Christian Kamm
2011-04-28 10:41:26 +02:00
Christiaan Janssen
85801227a9 QmlDebugger: keeping watches when changing stack frames
Reviewed-by: Kai Koehne
2011-04-20 17:33:26 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Christiaan Janssen
76212f67b0 QmlDebugger: removed prefix in expression for locals
Task-number: QTCREATORBUG-4462
Reviewed-by: Kai Koehne
2011-04-11 17:27:56 +02:00
con
530e7494dd Automatic versioning for the qml tools.
Reviewed-by: Thomas Hartmann
2011-03-29 17:54:52 +02:00
hjk
1e8a783abb version bump to 2.1.83 2011-03-25 17:21:28 +01:00
Thorbjørn Lindeijer
6161d0eb0c QmlJSDebugger: Disabled the Qt Quick tool box entirely for now
This tool box doesn't add much value since the same actions are
available from Qt Creator and in the case of using the Observer, some
actions are also available from its menus.

Reviewed-by: Kai Koehne
2011-03-23 17:37:58 +01:00
Thorbjørn Lindeijer
a8bf2ba5e3 QmlJSDebugger: Renamed "execution paused" to "animation paused"
The latter better describes what is paused, since expressions are
actually still executed.

Suggested by Kai.
2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
0a813cd67c QmlJSDebugger: Separated animation speed and paused state
This separates animation speed and paused state in the communication
protocol between the Qt Creator QmlJSInspector plugin and the
QmlJSDebugger server.

Point is to allow changing the speed of the animation before resuming
execution. These two things were already separated in the QML Observer,
but not in Qt Creator.

Reviewed-by: Kai Koehne
2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
1716d9bbb2 QmlJSDebugger: Define QMLJSDEBUGGER in qmljsdebugger-src.pri
This pri file is meant for including the qmljsdebugger sources into an
Qt Quick application to make the qmljsdebugger easier to develop. It
makes sense to define QMLJSDEBUGGER since without that the QmlJS
debugger part isn't used.

See also 304b3c881c.

Reviewed-by: Kai Koehne
2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
eab2518796 QmlJSDebugger: Fixed the enum toString methods
Should use valueToKey since the key method works by index.
2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
42b4e6c8f1 Observer: Fixed synchronization of animation speed and paused state
The menus of the Observer were not being updated correctly when
animation speed was changed or when the animations were paused.

Now the whole thing looks a bit cleaner and the Observer menu
uses the QDeclarativeViewObserver to change these settings and stays in
sync when they change from other places.

Reviewed-by: Kai Koehne
2011-03-22 10:40:46 +01:00