Compile fix if QT_NO_CLIPBOARD defined
authorAndreas Holzammer <andreas.holzammer.qnx@kdab.com>
Thu, 19 Apr 2012 13:53:42 +0000 (15:53 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 19 Apr 2012 14:20:02 +0000 (16:20 +0200)
Change-Id: I818122f2b2d2119248ad2e84b138aab8ab621a41
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
examples/widgets/charactermap/mainwindow.cpp
examples/widgets/charactermap/mainwindow.h

index 44eb307..fbe0df6 100644 (file)
@@ -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]
index 478df1d..3710982 100644 (file)
@@ -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;