Commit Graph

92 Commits

Author SHA1 Message Date
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
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
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
Thorbjørn Lindeijer
ba92d4c922 QmlJSDebugger: Removed the double-click feature from the color box
It was supposed to show a color dialog, but in practice it never worked
due to using show() rather than exec(). Removed it completely since it
was judged confusing and not very useful, since it is already possible
to copy the color by using the context menu.

Task-number: QTCREATORBUG-3878
Reviewed-by: Kai Koehne
2011-03-17 15:43:10 +01:00
Thorbjørn Lindeijer
8defa8a7ac QmlJSDebugger: Use QWidget::window to get to the top-level
Simplifies the code a bit.
2011-03-17 15:43:10 +01:00
Thorbjørn Lindeijer
f5761c9212 Fixed crash when QML app shuts down itself in debugging mode
The QDeclarativeViewObserverPrivate could end up referencing the tool bar
when it was already destroyed.

Reviewed-by: Kai Koehne
2011-03-15 16:45:28 +01:00
Thorbjørn Lindeijer
ed23c77cba Don't show the QML debugging tool bar in the simulator 2011-03-15 13:31:28 +01:00
Thorbjørn Lindeijer
29777da964 Avoid use of dynamic_cast in qmljsdebugger library
Remove usages of 'dynamic_cast' in qmljsdebugger library. Otherwise
compilation will fail for a Qt compiled with -no-rtti.

Task-number: QTCREATORBUG-4043
Reviewed-by: Kai Koehne
2011-03-14 15:40:40 +01:00
Oswald Buddenhagen
7007326837 clean up DEPENDPATH insanity
simply add
  CONFIG += depend_includepath
to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them
were missing anyway, and i wouldn't expect it to ever change. not
touching src/shared/ for syncing reasons.
2011-03-09 22:24:13 +01:00
Christiaan Janssen
ca3eedb8e5 QmlDebugger: hiding "this" from debugger when empty
Reviewed-by: Kai Koehne
2011-03-09 16:10:06 +01:00
Kai Koehne
315e18d79a QmlJsDebug: Fix regression in list of breakpoints
Allow more than one breakpoint per compilation unit.
2011-03-08 13:11:32 +01:00
Kai Koehne
304b3c881c QtQuickApp: Remove QMLJSDEBUGGER define from custom .pro file
The qmljsdebugger-lib.pri is only included in 2.2 if the user explicitly
selected it in the Project Settings.

Reviewed-by: Christiaan Janssen
2011-03-07 16:35:27 +01:00
Kai Koehne
1cb3cdc744 QmlJSDebug: List QtScript as explicit dependency
mingw/4.7.1 does not add QtScript otherwise to the list of files to link against.
2011-03-02 14:45:21 +01:00
Kai Koehne
20189574f6 QmlJsDebugger: Handle breakpoints in qrc:// resources more gracefully
Reviewed-by: Christiaan Janssen
2011-03-02 14:45:20 +01:00
Kai Koehne
844c34513d QmlJSDebugger: Compare only file names for .js breakpoints
The file names on device might be completely different, therefore
we cannot compare the absolute path.

Reviewed-by: Christiaan Janssen
2011-03-02 14:45:20 +01:00
Thorbjørn Lindeijer
d16e7a305e QmlJSDebugger: Only show the tool box when a debugging client connected
Reviewed-by: Christiaan Janssen
2011-02-28 17:20:31 +01:00
Thorbjørn Lindeijer
64c32469c8 QmlJSDebugger: Avoid warning in window flag logic 2011-02-28 17:20:31 +01:00
Thorbjørn Lindeijer
6355ed4734 QmlJSDebugger: Animation speed can always be changed
The play button, that also allows changing animation speed, should never
be disabled since it works both in and outside of "observer" mode.

Reviewed-by: Kai Koehne
2011-02-25 11:06:04 +01:00
Thorbjørn Lindeijer
ec92b3b2c0 QmlJSDebugger: Code cosmetics 2011-02-25 11:06:03 +01:00
Thorbjørn Lindeijer
603e7ade3f QmlJSDebugger: Switched message identifiers from string to enum
Avoids spelling problems, makes it easier to know all possible messages
and enables autocompletion.

The enum is part of a QObject derived class so that the meta object can
be used to print out the enumerators as readable strings.

Reviewed-by: Kai Koehne
2011-02-25 11:05:48 +01:00
Thorbjørn Lindeijer
6d6510139b QmlJSDebugger: Corrected some labels
Reviewed-by: Kai Koehne
2011-02-24 14:39:59 +01:00
Thorbjørn Lindeijer
eda6e85530 QmlJSDebugger: Fixed availability of resources of static library
On some systems, apparently including Linux and Windows, it is necessary
to manually initialize resources when they are included in a static
library, with Q_INIT_RESOURCE.
2011-02-24 13:40:56 +01:00
Kai Koehne
b7decc1356 QmlJSDebug: Fix compilation for debug builds on Windows
Make sure we pick up the debugger version of qmljsdebugger library.
2011-02-22 17:10:43 +01:00
Thorbjørn Lindeijer
e81e732452 QmlJSDebugger: Save and restore tool box geometry
Convenient since you'll usually move the tool box next to the
application window.

Reviewed-by: Kai Koehne
2011-02-22 16:38:20 +01:00
Thorbjørn Lindeijer
1ed42339ea QmlJSDebugger: Don't create the tool box when compiling for a device 2011-02-22 16:38:20 +01:00
Thorbjørn Lindeijer
a5d3fcbc07 QmlJSDebugger: Code cosmetics 2011-02-22 16:38:19 +01:00
Thorbjørn Lindeijer
b23c24d275 QmlJSDebugger: Show the tool bar of the declarative view observer
Now in a tool window so that it generally doesn't interfere with the
application.
2011-02-22 16:38:19 +01:00
Kai Koehne
6507f5ff83 QmlObserver: Allow to compile it again in source
Make it possible (again) to compile qmlobserver in share/qtcreator.
However, build artifacts in there might result in a malfunctioning
qtc-qmlobserver!

Reviewed-by: Thorbjorn Lindeijer
2011-02-21 16:40:53 +01:00
Kai Koehne
fbca39aefd QmlJsDebug: Fix compilation on Linux, Mac
Use camel case for library name all over the place.
2011-02-21 11:44:34 +01:00
Kai Koehne
3fef120d59 QmlJSDebug: Move qmljsdebug into a static library
Reviewed-by: dt
2011-02-18 12:57:45 +01:00
Kai Koehne
45187a15a7 QmlJSDebug: Avoid use of Q_PRIVATE_SLOTS macro
Causes headaches because of a bug in qmake that sometimes still tries
to compile the _moc file individually, resulting in not defined errors.
2011-02-18 12:57:34 +01:00