summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Holzammer <andreas.holzammer.qnx@kdab.com>2012-04-19 15:53:42 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-19 16:20:02 +0200
commit4acb8bfc59ae9fec77e25eeeaaece8a80f87dc50 (patch)
treed745a901e88630120c97204433e061eb87f0e43b
parentd48f3fc1e74f4d489238f511df56a134b53e6a0b (diff)
Compile fix if QT_NO_CLIPBOARD defined
Change-Id: I818122f2b2d2119248ad2e84b138aab8ab621a41 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r--examples/widgets/charactermap/mainwindow.cpp9
-rw-r--r--examples/widgets/charactermap/mainwindow.h4
2 files changed, 13 insertions, 0 deletions
diff --git a/examples/widgets/charactermap/mainwindow.cpp b/examples/widgets/charactermap/mainwindow.cpp
index 44eb30708d..fbe0df616c 100644
--- a/examples/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/charactermap/mainwindow.cpp
@@ -70,11 +70,13 @@ MainWindow::MainWindow()
//! [2]
lineEdit = new QLineEdit;
+#ifndef QT_NO_CLIPBOARD
QPushButton *clipboardButton = new QPushButton(tr("&To clipboard"));
//! [2]
//! [3]
clipboard = QApplication::clipboard();
+#endif
//! [3]
//! [4]
@@ -91,7 +93,10 @@ MainWindow::MainWindow()
//! [4] //! [5]
connect(characterWidget, SIGNAL(characterSelected(QString)),
this, SLOT(insertCharacter(QString)));
+
+#ifndef QT_NO_CLIPBOARD
connect(clipboardButton, SIGNAL(clicked()), this, SLOT(updateClipboard()));
+#endif
//! [5]
connect(fontMerging, SIGNAL(toggled(bool)), characterWidget, SLOT(updateFontMerging(bool)));
@@ -110,7 +115,9 @@ MainWindow::MainWindow()
QHBoxLayout *lineLayout = new QHBoxLayout;
lineLayout->addWidget(lineEdit, 1);
lineLayout->addSpacing(12);
+#ifndef QT_NO_CLIPBOARD
lineLayout->addWidget(clipboardButton);
+#endif
QVBoxLayout *centralLayout = new QVBoxLayout;
centralLayout->addLayout(controlsLayout);
@@ -185,6 +192,7 @@ void MainWindow::insertCharacter(const QString &character)
//! [9]
//! [10]
+#ifndef QT_NO_CLIPBOARD
void MainWindow::updateClipboard()
{
//! [11]
@@ -192,4 +200,5 @@ void MainWindow::updateClipboard()
//! [11]
clipboard->setText(lineEdit->text(), QClipboard::Selection);
}
+#endif
//! [10]
diff --git a/examples/widgets/charactermap/mainwindow.h b/examples/widgets/charactermap/mainwindow.h
index 478df1dc06..37109827ab 100644
--- a/examples/widgets/charactermap/mainwindow.h
+++ b/examples/widgets/charactermap/mainwindow.h
@@ -66,11 +66,15 @@ public slots:
void findStyles(const QFont &font);
void findSizes(const QFont &font);
void insertCharacter(const QString &character);
+#ifndef QT_NO_CLIPBOARD
void updateClipboard();
+#endif
private:
CharacterWidget *characterWidget;
+#ifndef QT_NO_CLIPBOARD
QClipboard *clipboard;
+#endif
QComboBox *styleCombo;
QComboBox *sizeCombo;
QFontComboBox *fontCombo;