diff options
| author | Andreas Holzammer <andreas.holzammer.qnx@kdab.com> | 2012-04-19 20:18:21 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 22:54:24 +0200 |
| commit | bfad100013c3273c8795a0a6ea13a2c2261e68d1 (patch) | |
| tree | 55afd5f2c3601bf1850be5d2f5216a4dc3329b12 /src/pixeltool | |
| parent | 8059b4b64f371f584f9fa383583371a2c05391a3 (diff) | |
Compile fix if QT_NO_CLIPBOARD defined
Change-Id: I3a4126c370b09c56c2e869254962035ae36c7c75
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/pixeltool')
| -rw-r--r-- | src/pixeltool/qpixeltool.cpp | 10 | ||||
| -rw-r--r-- | src/pixeltool/qpixeltool.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp index 792f0e115..ba422cd94 100644 --- a/src/pixeltool/qpixeltool.cpp +++ b/src/pixeltool/qpixeltool.cpp @@ -44,7 +44,9 @@ #include <qapplication.h> #include <qdesktopwidget.h> #include <qapplication.h> +#ifndef QT_NO_CLIPBOARD #include <qclipboard.h> +#endif #include <qpainter.h> #include <qevent.h> #include <qfiledialog.h> @@ -250,10 +252,12 @@ void QPixelTool::keyPressEvent(QKeyEvent *e) case Qt::Key_A: m_autoUpdate = !m_autoUpdate; break; +#ifndef QT_NO_CLIPBOARD case Qt::Key_C: if (e->modifiers() & Qt::ControlModifier) copyToClipboard(); break; +#endif case Qt::Key_S: if (e->modifiers() & Qt::ControlModifier) { releaseKeyboard(); @@ -365,9 +369,11 @@ void QPixelTool::contextMenuEvent(QContextMenuEvent *e) QAction save(QLatin1String("Save as image"), &menu); save.setShortcut(QKeySequence(QLatin1String("Ctrl+S"))); connect(&save, SIGNAL(triggered()), this, SLOT(saveToFile())); +#ifndef QT_NO_CLIPBOARD QAction copy(QLatin1String("Copy to clipboard"), &menu); copy.setShortcut(QKeySequence(QLatin1String("Ctrl+C"))); connect(©, SIGNAL(triggered()), this, SLOT(copyToClipboard())); +#endif menu.addAction(&title); menu.addSeparator(); @@ -385,7 +391,9 @@ void QPixelTool::contextMenuEvent(QContextMenuEvent *e) menu.addAction(&autoUpdate); menu.addSeparator(); menu.addAction(&save); +#ifndef QT_NO_CLIPBOARD menu.addAction(©); +#endif menu.exec(mapToGlobal(e->pos())); @@ -514,11 +522,13 @@ void QPixelTool::setGridSize(int gridSize) } } +#ifndef QT_NO_CLIPBOARD void QPixelTool::copyToClipboard() { QClipboard *cb = QApplication::clipboard(); cb->setPixmap(m_buffer); } +#endif void QPixelTool::saveToFile() { diff --git a/src/pixeltool/qpixeltool.h b/src/pixeltool/qpixeltool.h index cc25f1d50..c535f96c7 100644 --- a/src/pixeltool/qpixeltool.h +++ b/src/pixeltool/qpixeltool.h @@ -74,7 +74,9 @@ public slots: void toggleGrid(); void toggleFreeze(); void setZoomVisible(bool visible); +#ifndef QT_NO_CLIPBOARD void copyToClipboard(); +#endif void saveToFile(); void increaseGridSize() { setGridSize(m_gridSize + 1); } void decreaseGridSize() { setGridSize(m_gridSize - 1); } |