diff options
| author | con <qtc-committer@nokia.com> | 2010-12-17 17:00:53 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-12-17 17:00:53 +0100 |
| commit | b1bcf081d8f92705d5b37ed9778e74bf51e55f6a (patch) | |
| tree | 1be892b8bf2d19b377c33ed47cd5fe1b1e5c6e98 /doc/images/qmldesigner-snap-margins.png | |
| parent | 77f45caee0a24250a0f39ed8c127e3d4969a83e2 (diff) | |
| parent | 04e32b0049d4e282e5e0991197bbf96714b3ef53 (diff) | |
| download | qt-creator-b1bcf081d8f92705d5b37ed9778e74bf51e55f6a.tar.gz | |
Merge branch '2.1'
Conflicts:
src/plugins/coreplugin/basemode.cpp
src/plugins/coreplugin/basemode.h
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
src/plugins/debugger/debuggeragents.cpp
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/debugger/debuggeruiswitcher.h
src/plugins/projectexplorer/buildconfigdialog.cpp
src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
src/plugins/qmldesigner/designercore/include/modelutilities.h
src/plugins/qmldesigner/designercore/include/nodeinstance.h
src/plugins/qmldesigner/designercore/include/propertymetainfo.h
src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
src/plugins/qmldesigner/designercore/model/modelutilities.cpp
src/plugins/snippets/inputwidget.cpp
src/plugins/snippets/snippetscompletion.cpp
src/plugins/snippets/snippetscompletion.h
src/plugins/snippets/snippetspec.cpp
src/plugins/snippets/snippetsplugin.cpp
src/plugins/snippets/snippetswindow.cpp
src/plugins/snippets/snippetswindow.h
src/plugins/texteditor/snippetsparser.cpp
src/tools/qml/qmldom/main.cpp
tests/manual/trk/runner.cpp
tests/manual/trk/trkolddevice.cpp
tests/manual/trk/trkolddevice.h
tests/manual/trk/trkserver.cpp
Diffstat (limited to 'doc/images/qmldesigner-snap-margins.png')
| -rw-r--r-- | doc/images/qmldesigner-snap-margins.png | bin | 0 -> 7711 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/images/qmldesigner-snap-margins.png b/doc/images/qmldesigner-snap-margins.png Binary files differnew file mode 100644 index 0000000000..d34ab3557f --- /dev/null +++ b/doc/images/qmldesigner-snap-margins.png |