Commit Graph

270 Commits

Author SHA1 Message Date
Eike Ziller
e5ca4b3462 Merge remote-tracking branch 'origin/2.3'
Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
2011-07-15 14:29:07 +02:00
hjk
82bbac7f90 Remove unneeded defines.
Mostly Q_DISABLE_COPY that were covered by the un-copy-ability of the
respective base classes. Includes a few "stylistic" whitespace changes.

Change-Id: I31ca0e7bada5ed0f34776976efe22ddc444a5bf2
Reviewed-on: http://codereview.qt.nokia.com/1609
Reviewed-by: hjk <qthjk@ovi.com>
2011-07-14 12:15:38 +02:00
Christiaan Janssen
bd92b51296 QmlInspector: correctly displaying 4-byte colors
Task-number: QTCREATORBUG-5355

Change-Id: Ic0e6367df2728d62799aedfb6f1c2745f4a5a894
Reviewed-on: http://codereview.qt.nokia.com/1416
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2011-07-11 14:49:07 +02:00
Kai Koehne
bff9e2618b QmlJSInspector: Fix naming of QmlInspectorToolBar
Add a 'Js' to make it align with the other classes of the plugin.

Change-Id: If9514d7ed3a2244a60e7ebc72256ddfc25695c68
Reviewed-on: http://codereview.qt.nokia.com/817
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-06-28 10:08:55 +02:00
Kai Koehne
7c90a35131 QmlInspector: Get rid of explicit 'Design mode' button
Instead let the user just select & deselect between the Zoom Tool,
the Selection Tool and the Color Picker.

Change-Id: Ieac0bc0381760237004599e59cafa43544fb03d4
Reviewed-on: http://codereview.qt.nokia.com/753
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-06-27 13:55:21 +02:00
Kai Koehne
46f2166a3b QmlDebugger: Improve Toolbar
Move Play/Pause animations out of Inspector related icons,
and add a visual separator.

Change-Id: Ifec50dbcfb4486205416790710f57bfcc552b637
Reviewed-on: http://codereview.qt.nokia.com/562
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-06-21 16:28:18 +02:00
Kai Koehne
23697dcd99 QmlDebugger: New icon for Inspector mode
Change-Id: I6372b858207bd55d8713294ceda701e05e1d5739
Reviewed-on: http://codereview.qt.nokia.com/561
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-06-21 16:27:55 +02:00
hjk
309593704d qmljsinspector: style
Change-Id: I4d776b9d0ce77a74d0347eb08c15026982ab8054
Reviewed-on: http://codereview.qt.nokia.com/258
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-05-31 11:41:32 +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
Thorbjørn Lindeijer
38c798a642 Made CrumblePath API a bit more consistent/generic
Was a bit confusing to pass QVariant data in and get an int back.

Change-Id: I613d2eb88ade45baee85a4f84d7db6d3ce7fb923
Reviewed-on: http://codereview.qt.nokia.com/205
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-05-30 11:59:40 +02:00
Thorbjørn Lindeijer
5647e67762 QmlJSInspector: Fixed multi-selection bug
Nothing useful can be done with multi-selection at the moment, but this
bug was introduced in 8d0601515e and is
better to fix straight away.

What happened was that when multiple items are selected in the observed
QML application, Qt Creator would pick the first and send that back as
the new selection. This made it impossible to select more than one item.

Task-number: QTCREATORBUG-3426
Change-Id: I68283480af5e0a21e32e51a49848ff9a809ed5ec
Reviewed-on: http://codereview.qt.nokia.com/151
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-26 16:55:16 +02:00
Thorbjørn Lindeijer
97ca81fc6d QmlJSInspector: Removed context path related things
Apparently this part of the protocol was already not being used at all.
Now that the SubcomponentEditorTool will be removed it is no longer
relevant.

Change-Id: I5710fe815be233548e590e90410b85ed4fa3487c
Reviewed-on: http://codereview.qt.nokia.com/88
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-25 10:12:54 +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
Oswald Buddenhagen
882e34ee28 rewrite editor info bar handling
the info about the bars is now stored in the IFile, not in the
EditorView. this is somewhat more expensive for the bars which
identically apply to all editors of one type, but fixes consistency
issues between views.

additionally, it is now possible to set several simultaneous
info bars per file, which ensures that no information is lost.

Co-authored-by: mae
2011-05-12 20:10:02 +02:00
Thorbjørn Lindeijer
8d0601515e QmlJSInspector: Sync crumble path selection back to the observer
Now selecting an item via the crumble path modifies the selection in the
observed QML application accordingly.

Reviewed-by: Christiaan Janssen
2011-05-12 15:39:11 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Christiaan Janssen
89d9b83aa2 QmlDebugger: adding slots to items in Live Preview
Reviewed-by: Kai Koehne
2011-05-05 17:03:37 +02:00
Kai Koehne
8a28be85c6 QmlObserver: Disable crumblepath if not active 2011-04-27 17:25:48 +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
Jarek Kobus
4d69c7455e Remove unused constants, fix lacking virtual destructor
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-04-14 12:08:47 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Kai Koehne
986c9560e9 QmlObserver: Fix 'Apply Changes on Save' on Mac
Use the generic FileInProjectFinder instead of some homebrewn
matching algorithm (which didn't handle the case that on  Mac OS X,
files are copied to the app bundle).

Reviewed-by: Christiaan Janssen
Task-number: QTCREATORBUG-3188
2011-04-08 11:58:48 +02: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
Kai Koehne
58e697bc09 QmlDebug: Fix crash on app closing
Make sure that the engineClient object is the parent of all of its
queries, since the destructor of a query might try to access the client
...

Reviewed-by: Christiaan Janssen
Task-number: QTCREATORBUG-4105
2011-03-21 15:07:34 +01:00
Kai Koehne
bd2e4af905 QmlJsDebug: Remove unused code 2011-03-21 15:07:34 +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
Christiaan Janssen
ecce5bca6f QmlInspector: break selection loop on cursor change
Reviewed-by: Kai Koehne
2011-03-08 13:26:29 +01:00
Christiaan Janssen
512fe4b668 QmlInspector: fixed bug in crumblepath 2011-02-28 17:14:55 +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
hjk
f576ad9f2c texteditor: merge ITextEditable into ITextEditor
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
2011-02-22 11:23:53 +01:00
Thorbjørn Lindeijer
c3a6a3eb06 QmlJSInspector: Always allow play/pause and changing animation speed
There seems to be no reason not to allow this outside of the observer
mode.
2011-02-21 15:31:23 +01:00
Thorbjørn Lindeijer
faabfde7f6 QmlJSInspector: Use a FilterLineEdit for the properties filter
Adds a clear button when text is entered.
2011-02-21 14:13:42 +01:00
Kai Koehne
f70bc0180d QmlDebug: Remove assert
Removing an object watch might fail if e.g. the app crashes in between.
2011-02-18 11:50:27 +01:00
Friedemann Kleint
fe5a7ed242 L10n: Translation fixes. 2011-02-18 09:59:33 +01:00
Kai Koehne
8d14887446 QmlDebug: Move QDDEngineDebug instance to ClientProxy
Only the ClientProxy uses it anyway.

Reviewed-by: Thorbjorn Lindeijer
2011-02-17 16:11:41 +01:00
Thorbjørn Lindeijer
19aa31979c QmlJSInspector: Make string translatable 2011-02-17 12:54:52 +01:00
Thorbjørn Lindeijer
522ffd8622 QmlJSInspector: Code cosmetics 2011-02-17 12:33:53 +01:00
Thorbjørn Lindeijer
07014f82a0 QmlJSInspector: Fixed the border around the color icon
It was being drawn one pixel too large, showing some garbage pixels.
2011-02-17 12:24:01 +01:00
Thorbjørn Lindeijer
b2424347b7 QmlJSInspector: Fixed position of crumble path menu
These buttons are not in a regular layout so they were not being resized
down to the available size. Just specify a fixed height on all levels
now, and make sure it is consistent.
2011-02-17 11:52:37 +01:00
Thorbjørn Lindeijer
4af3d9bdd2 Code cosmetics 2011-02-17 10:17:36 +01:00
Thorbjørn Lindeijer
7f90d08c18 QmlJSInspector: Moved the property filter back into the QML observer dock
Changed around the way the background is drawn on the crumble path, so
that the background extends below the filter line edit.

Reviewed-by: Kai Koehne
2011-02-17 10:17:35 +01:00
Thorbjørn Lindeijer
f5c192bf38 Introduced a QML-specific debugger tool bar
This one has the common debugger actions as well as the QML Observer
specific part. This makes sure those actions are generally available and
not only from the QML Observer dock widget.

The filter in the tool bar should still be moved back.

Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-02-16 13:36:12 +01:00
Thorbjørn Lindeijer
7741db1220 Code cosmetics 2011-02-16 11:36:06 +01:00
Friedemann Kleint
3179e4642c Compile fix Mac gcc 4.2.1 2011-02-16 11:25:24 +01:00
Christiaan Janssen
6ec5d03490 QmlInspector: custom editors for different property types
Reviewed-by: Kai Koehne
2011-02-16 09:23:13 +01:00
Christiaan Janssen
49fa40cf9e QmlInspector: changed crumblepath appearance
Reviewed-by: Kai Koehne
2011-02-10 14:33:20 +01:00
Thorbjørn Lindeijer
f9e65028fd QmlJSDebugger: Prefix live editor related classes
AbstractFormEditorTool -> AbstractLiveEditTool
LayerItem -> LiveLayerItem
SelectionIndicator -> LiveSelectionIndicator
SelectionRectangle -> LiveSelectionRectangle
SelectionTool -> LiveSelectionTool
SingleSelectionManipulator -> LiveSingleSelectionManipulator
RubberBandSelectionManipulator -> LiveRubberBandSelectionManipulator
2011-02-09 17:14:27 +01:00