diff options
| -rw-r--r-- | src/gui/doc/snippets/clipboard/clipboard.pro | 13 | ||||
| -rw-r--r-- | src/gui/doc/snippets/clipboard/clipwindow.cpp | 11 | ||||
| -rw-r--r-- | src/gui/doc/snippets/snippets.pro | 1 | ||||
| -rw-r--r-- | src/gui/doc/src/dnd.qdoc | 2 |
4 files changed, 16 insertions, 11 deletions
diff --git a/src/gui/doc/snippets/clipboard/clipboard.pro b/src/gui/doc/snippets/clipboard/clipboard.pro index a26fea6b57..521b67aca9 100644 --- a/src/gui/doc/snippets/clipboard/clipboard.pro +++ b/src/gui/doc/snippets/clipboard/clipboard.pro @@ -1,3 +1,10 @@ -HEADERS = clipwindow.h -SOURCES = clipwindow.cpp \ - main.cpp +TEMPLATE = lib +TARGET = clipboard_snippets +QT += core gui widgets + +HEADERS = \ + clipwindow.h + +SOURCES = \ + clipwindow.cpp \ + main.cpp diff --git a/src/gui/doc/snippets/clipboard/clipwindow.cpp b/src/gui/doc/snippets/clipboard/clipwindow.cpp index d1b39070fa..2ec10ec649 100644 --- a/src/gui/doc/snippets/clipboard/clipwindow.cpp +++ b/src/gui/doc/snippets/clipboard/clipwindow.cpp @@ -49,6 +49,7 @@ ****************************************************************************/ #include <QtWidgets> +#include <QMimeData> #include "clipwindow.h" @@ -70,8 +71,6 @@ ClipWindow::ClipWindow(QWidget *parent) connect(clipboard, &QClipboard::dataChanged, this, &ClipWindow::updateClipboard); //! [0] - connect(mimeTypeCombo, QOverload<QString>::of(&QComboBox::activated), - this, &ClipWindow::updateData); QVBoxLayout *currentLayout = new QVBoxLayout(currentItem); currentLayout->addWidget(mimeTypeLabel); @@ -92,20 +91,20 @@ ClipWindow::ClipWindow(QWidget *parent) void ClipWindow::updateClipboard() { QStringList formats = clipboard->mimeData()->formats(); - QByteArray data = clipboard->mimeData()->data(format); + for (const auto &format : formats) { + QByteArray data = clipboard->mimeData()->data(format); + // ... + } //! [1] mimeTypeCombo->clear(); - mimeTypeCombo->insertStringList(formats); int size = clipboard->mimeData()->data(formats[0]).size(); QListWidgetItem *newItem = new QListWidgetItem(previousItems); newItem->setText(tr("%1 (%2 bytes)").arg(formats[0]).arg(size)); updateData(formats[0]); -//! [2] } -//! [2] void ClipWindow::updateData(const QString &format) { diff --git a/src/gui/doc/snippets/snippets.pro b/src/gui/doc/snippets/snippets.pro index 7407d61cc7..fea4819ece 100644 --- a/src/gui/doc/snippets/snippets.pro +++ b/src/gui/doc/snippets/snippets.pro @@ -4,6 +4,7 @@ SUBDIRS = contains(QT_BUILD_PARTS, tests) { SUBDIRS += \ brush \ + clipboard \ code \ draganddrop \ qfontdatabase \ diff --git a/src/gui/doc/src/dnd.qdoc b/src/gui/doc/src/dnd.qdoc index 945c485705..35bb47fdb6 100644 --- a/src/gui/doc/src/dnd.qdoc +++ b/src/gui/doc/src/dnd.qdoc @@ -377,8 +377,6 @@ using one of the MIME types that can be used to represent it: \snippet clipboard/clipwindow.cpp 1 - \dots - \snippet clipboard/clipwindow.cpp 2 The \l{QClipboard::selectionChanged()}{selectionChanged()} signal can be used on X11 to monitor the mouse selection. |