1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regularexpression example: Fix compilation with clipboard disabled

Browse Source 
Use the new configure system consistently.

Task-number: QTBUG-63429
Change-Id: I6668ba9fde09492f3e60e614103e18e88783d0c4
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Friedemann Kleint 2017-09-26 14:45:52 +02:00 committed by Jani Heikkinen
parent 807fa90b32
commit 267b1a140a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/widgets/tools/regularexpression/regularexpressiondialog.cpp
View File

@ -129,6 +129,10 @@ PatternLineEdit::PatternLineEdit(QWidget *parent) :
connect(escapeSelectionAction, &QAction::triggered, this, &PatternLineEdit::escapeSelection); connect(escapeSelectionAction, &QAction::triggered, this, &PatternLineEdit::escapeSelection);
connect(copyToCodeAction, &QAction::triggered, this, &PatternLineEdit::copyToCode); connect(copyToCodeAction, &QAction::triggered, this, &PatternLineEdit::copyToCode);
connect(pasteFromCodeAction, &QAction::triggered, this, &PatternLineEdit::pasteFromCode); connect(pasteFromCodeAction, &QAction::triggered, this, &PatternLineEdit::pasteFromCode);
#if !QT_CONFIG(clipboard)
copyToCodeAction->setEnabled(false);
pasteFromCodeAction->setEnabled(false);
#endif
} }
void PatternLineEdit::escapeSelection() void PatternLineEdit::escapeSelection()
@ -144,12 +148,16 @@ void PatternLineEdit::escapeSelection()
void PatternLineEdit::copyToCode() void PatternLineEdit::copyToCode()
{ {
#if QT_CONFIG(clipboard)
QGuiApplication::clipboard()->setText(patternToCode(text())); QGuiApplication::clipboard()->setText(patternToCode(text()));
#endif
} }
void PatternLineEdit::pasteFromCode() void PatternLineEdit::pasteFromCode()
{ {
#if QT_CONFIG(clipboard)
setText(codeToPattern(QGuiApplication::clipboard()->text())); setText(codeToPattern(QGuiApplication::clipboard()->text()));
#endif
} }
void PatternLineEdit::contextMenuEvent(QContextMenuEvent *event) void PatternLineEdit::contextMenuEvent(QContextMenuEvent *event)
@ -316,7 +324,7 @@ void RegularExpressionDialog::refresh()
void RegularExpressionDialog::copyEscapedPatternToClipboard() void RegularExpressionDialog::copyEscapedPatternToClipboard()
{ {
#ifndef QT_NO_CLIPBOARD #if QT_CONFIG(clipboard)
QClipboard *clipboard = QGuiApplication::clipboard(); QClipboard *clipboard = QGuiApplication::clipboard();
if (clipboard) if (clipboard)
clipboard->setText(escapedPatternLineEdit->text()); clipboard->setText(escapedPatternLineEdit->text());
@ -361,7 +369,7 @@ QWidget *RegularExpressionDialog::setupLeftUi()
palette.setBrush(QPalette::Base, palette.brush(QPalette::Disabled, QPalette::Base)); palette.setBrush(QPalette::Base, palette.brush(QPalette::Disabled, QPalette::Base));
escapedPatternLineEdit->setPalette(palette); escapedPatternLineEdit->setPalette(palette);
#ifndef QT_NO_CLIPBOARD #if QT_CONFIG(clipboard)
QAction *copyEscapedPatternAction = new QAction(this); QAction *copyEscapedPatternAction = new QAction(this);
copyEscapedPatternAction->setText(tr("Copy to clipboard")); copyEscapedPatternAction->setText(tr("Copy to clipboard"));
copyEscapedPatternAction->setIcon(QIcon(QStringLiteral(":/images/copy.png"))); copyEscapedPatternAction->setIcon(QIcon(QStringLiteral(":/images/copy.png")));