diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 14:01:35 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-23 14:45:03 +0200 |
| commit | 790aef362fd195adf97d8c780a7cbbbade27d51f (patch) | |
| tree | 8be464687ab21806cfe9f7ada27098b563aa41b2 /examples/widgets/richtext/textedit/textedit.cpp | |
| parent | 9720efbd1035c2e939b0581163e6d804c713dd96 (diff) | |
| parent | 07475c662eb73c833da2d461b8ef2702ca1e2cfb (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
configure
src/corelib/global/qglobal.h
src/tools/qdoc/node.cpp
src/tools/qdoc/qdocdatabase.cpp
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
tools/configure/configureapp.cpp
Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
Diffstat (limited to 'examples/widgets/richtext/textedit/textedit.cpp')
| -rw-r--r-- | examples/widgets/richtext/textedit/textedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index 201151c32e..be46c4d008 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -115,10 +115,10 @@ TextEdit::TextEdit(QWidget *parent) actionUndo->setEnabled(textEdit->document()->isUndoAvailable()); actionRedo->setEnabled(textEdit->document()->isRedoAvailable()); +#ifndef QT_NO_CLIPBOARD actionCut->setEnabled(false); actionCopy->setEnabled(false); -#ifndef QT_NO_CLIPBOARD connect(QApplication::clipboard(), &QClipboard::dataChanged, this, &TextEdit::clipboardDataChanged); #endif @@ -202,6 +202,7 @@ void TextEdit::setupEditActions() tb->addAction(actionRedo); menu->addSeparator(); +#ifndef QT_NO_CLIPBOARD const QIcon cutIcon = QIcon::fromTheme("edit-cut", QIcon(rsrcPath + "/editcut.png")); actionCut = menu->addAction(cutIcon, tr("Cu&t"), textEdit, &QTextEdit::cut); actionCut->setPriority(QAction::LowPriority); @@ -219,7 +220,6 @@ void TextEdit::setupEditActions() actionPaste->setPriority(QAction::LowPriority); actionPaste->setShortcut(QKeySequence::Paste); tb->addAction(actionPaste); -#ifndef QT_NO_CLIPBOARD if (const QMimeData *md = QApplication::clipboard()->mimeData()) actionPaste->setEnabled(md->hasText()); #endif |