diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-12-30 17:39:21 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-01-02 09:58:44 +0100 |
| commit | 0f315adf9199efcfafa44371464ab6d1fc866774 (patch) | |
| tree | 35b67591255624c670aff0579e45b2973f56fd81 /examples/widgets/doc/src/draggabletext.qdoc | |
| parent | 2b0eb3fac319a17dd92903106d501f0f06df871f (diff) | |
| parent | 52b85212a2ec8ec5bf187f6cd00b669a45bcf0bd (diff) | |
| download | qtbase-0f315adf9199efcfafa44371464ab6d1fc866774.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
sc/corelib/io/qfsfileengine_p.h
src/corelib/io/qstorageinfo_unix.cpp
src/platformsupport/eglconvenience/qeglpbuffer_p.h
src/platformsupport/input/libinput/qlibinputkeyboard.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/ios/qiosscreen.h
src/plugins/platforms/ios/qioswindow.h
src/plugins/platforms/ios/quiview.mm
src/printsupport/dialogs/qpagesetupdialog_unix_p.h
src/printsupport/dialogs/qprintpreviewdialog.cpp
src/printsupport/widgets/qcupsjobwidget_p.h
src/widgets/widgets/qmenu.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c
Diffstat (limited to 'examples/widgets/doc/src/draggabletext.qdoc')
| -rw-r--r-- | examples/widgets/doc/src/draggabletext.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/widgets/doc/src/draggabletext.qdoc b/examples/widgets/doc/src/draggabletext.qdoc index c4a694028b..97b2f036bd 100644 --- a/examples/widgets/doc/src/draggabletext.qdoc +++ b/examples/widgets/doc/src/draggabletext.qdoc @@ -28,6 +28,7 @@ /*! \example draganddrop/draggabletext \title Draggable Text Example + \brief Illustrates how to drag and drop text between widgets \brief The Draggable Text example shows how to drag and drop textual data between widgets in the same application, and between different applications. |