diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 18:18:29 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-16 18:18:29 +0000 |
| commit | 6b9c57f8cd3df65702db327616913fa9d8172237 (patch) | |
| tree | 087d7035f7f722279c35f28f7f65f508bdc157f6 /examples | |
| parent | 8a2401bd45bb5991cf4c6a69539cb58f72e19994 (diff) | |
| parent | 59b275b2842b33e6e86233261fb921747c11cc54 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6.2' into 5.6" into refs/staging/5.6
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/dialogs/findfiles/window.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/examples/widgets/dialogs/findfiles/window.cpp b/examples/widgets/dialogs/findfiles/window.cpp index ce53dd8c83..1c59054524 100644 --- a/examples/widgets/dialogs/findfiles/window.cpp +++ b/examples/widgets/dialogs/findfiles/window.cpp @@ -294,15 +294,19 @@ void Window::contextMenu(const QPoint &pos) if (!item) return; QMenu menu; +#ifndef QT_NO_CLIPBOARD QAction *copyAction = menu.addAction("Copy Name"); +#endif QAction *openAction = menu.addAction("Open"); QAction *action = menu.exec(filesTable->mapToGlobal(pos)); if (!action) return; const QString fileName = fileNameOfItem(item); - if (action == copyAction) - QGuiApplication::clipboard()->setText(QDir::toNativeSeparators(fileName)); - else if (action == openAction) + if (action == openAction) openFile(fileName); +#ifndef QT_NO_CLIPBOARD + else if (action == copyAction) + QGuiApplication::clipboard()->setText(QDir::toNativeSeparators(fileName)); +#endif } //! [16] |