diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-05 13:42:11 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-05 13:42:11 +0100 |
| commit | 5e8ae03578ecd0538a774505f2f7e2fc626b0ab7 (patch) | |
| tree | 3b6f704df4d55d0ed2a5a706acf785541a74a45e /src/gui/doc | |
| parent | 7a5fea113ec6088135b0b6a0fc4297e0ef362bc5 (diff) | |
| parent | be3fb9afe50361e4b35d02d28ef30851335b17b6 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/kernel/qtimerinfo_unix.cpp
src/plugins/platforms/cocoa/qcocoabackingstore.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/windows/qwindowswindow.cpp
src/plugins/platforms/xcb/qglxintegration.cpp
Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac
Diffstat (limited to 'src/gui/doc')
| -rw-r--r-- | src/gui/doc/images/qpainter-text.png | bin | 1391 -> 1185 bytes | |||
| -rw-r--r-- | src/gui/doc/src/dnd.qdoc | 3 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/doc/images/qpainter-text.png b/src/gui/doc/images/qpainter-text.png Binary files differindex e95c965d7b..e1b11d0790 100644 --- a/src/gui/doc/images/qpainter-text.png +++ b/src/gui/doc/images/qpainter-text.png diff --git a/src/gui/doc/src/dnd.qdoc b/src/gui/doc/src/dnd.qdoc index 50b8c80ff3..1c6ca9c81c 100644 --- a/src/gui/doc/src/dnd.qdoc +++ b/src/gui/doc/src/dnd.qdoc @@ -33,8 +33,7 @@ \ingroup qt-gui-concepts Drag and drop provides a simple visual mechanism which users can use - to transfer information between and within applications. (In the - literature this is referred to as a "direct manipulation model".) Drag + to transfer information between and within applications. Drag and drop is similar in function to the clipboard's cut and paste mechanism. |
