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

..

images

QmlInspector: Get rid of explicit 'Design mode' button

2011-06-27 13:55:21 +02:00

qmljsclientproxy.cpp

QmlJSInspector: Renamed Observer to Inspector

2011-05-31 09:44:09 +02:00

qmljsclientproxy.h

Remove unneeded defines.

2011-07-14 12:15:38 +02:00

qmljscontextcrumblepath.cpp

Made CrumblePath API a bit more consistent/generic

2011-05-30 11:59:40 +02:00

qmljscontextcrumblepath.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

qmljsinspector_global.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

qmljsinspector.cpp

QmlJSInspector: Fix naming of QmlInspectorToolBar

2011-06-28 10:08:55 +02:00

qmljsinspector.h

QmlJSInspector: Fix naming of QmlInspectorToolBar

2011-06-28 10:08:55 +02:00

QmlJSInspector.pluginspec.in

It's 2011 now.

2011-01-12 09:46:24 +01:00

qmljsinspector.pro

QmlJSInspector: Fix naming of QmlInspectorToolBar

2011-06-28 10:08:55 +02:00

qmljsinspector.qrc

QmlInspector: Get rid of explicit 'Design mode' button

2011-06-27 13:55:21 +02:00

qmljsinspectorclient.cpp

QmlJSInspector: Renamed Observer to Inspector

2011-05-31 09:44:09 +02:00

qmljsinspectorclient.h

QmlJSInspector: Renamed Observer to Inspector

2011-05-31 09:44:09 +02:00

qmljsinspectorconstants.h

QmlInspector: Get rid of explicit 'Design mode' button

2011-06-27 13:55:21 +02:00

qmljsinspectorplugin.cpp

QmlJSInspector: Fix naming of QmlInspectorToolBar

2011-06-28 10:08:55 +02:00

qmljsinspectorplugin.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

qmljsinspectorsettings.cpp

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

qmljsinspectorsettings.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

qmljsinspectortoolbar.cpp

QmlJSInspector: Fix naming of QmlInspectorToolBar

2011-06-28 10:08:55 +02:00

qmljsinspectortoolbar.h

QmlJSInspector: Fix naming of QmlInspectorToolBar

2011-06-28 10:08:55 +02:00

qmljslivetextpreview.cpp

QmlJSInspector: Renamed Observer to Inspector

2011-05-31 09:44:09 +02:00

qmljslivetextpreview.h

QmlJSInspector: Renamed Observer to Inspector

2011-05-31 09:44:09 +02:00

qmljsprivateapi.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

qmljspropertyinspector.cpp

QmlInspector: correctly displaying 4-byte colors

2011-07-11 14:49:07 +02:00

qmljspropertyinspector.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

qmljstoolbarcolorbox.cpp

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

qmljstoolbarcolorbox.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00