diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2011-02-25 08:28:36 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2011-03-16 09:22:42 (GMT) |
| commit | 451d1c58913404e27b63395996a2e4b9aab65b95 (patch) | |
| tree | c76d3cd1f209654317ac22c144fd310164f2586d | |
| parent | 2eddefa0d26e32e1f8e2dd93998ff14ff9c912d2 (diff) | |
| download | Qt-451d1c58913404e27b63395996a2e4b9aab65b95.zip Qt-451d1c58913404e27b63395996a2e4b9aab65b95.tar.gz Qt-451d1c58913404e27b63395996a2e4b9aab65b95.tar.bz2 | |
Lighthouse: Support Q_NO_CLIPBOARD.
Reviewed-by: Jørgen Lind
| -rw-r--r-- | src/gui/kernel/qplatformclipboard_qpa.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformclipboard_qpa.h | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformintegration_qpa.cpp | 5 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformintegration_qpa.h | 2 |
4 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformclipboard_qpa.cpp b/src/gui/kernel/qplatformclipboard_qpa.cpp index fff4e19..8321e94 100644 --- a/src/gui/kernel/qplatformclipboard_qpa.cpp +++ b/src/gui/kernel/qplatformclipboard_qpa.cpp @@ -40,6 +40,8 @@ ****************************************************************************/ #include "qplatformclipboard_qpa.h" +#ifndef QT_NO_CLIPBOARD + QT_BEGIN_NAMESPACE class QClipboardData @@ -99,3 +101,5 @@ bool QPlatformClipboard::supportsMode(QClipboard::Mode mode) const } QT_END_NAMESPACE + +#endif //QT_NO_CLIPBOARD diff --git a/src/gui/kernel/qplatformclipboard_qpa.h b/src/gui/kernel/qplatformclipboard_qpa.h index 3f7bfbb..51371cb 100644 --- a/src/gui/kernel/qplatformclipboard_qpa.h +++ b/src/gui/kernel/qplatformclipboard_qpa.h @@ -44,6 +44,8 @@ #include <qplatformdefs.h> +#ifndef QT_NO_CLIPBOARD + #include <QtGui/QClipboard> QT_BEGIN_HEADER @@ -66,5 +68,6 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_CLIPBOARD #endif //QPLATFORMCLIPBOARD_QPA_H diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp index f43e141..06ac40f 100644 --- a/src/gui/kernel/qplatformintegration_qpa.cpp +++ b/src/gui/kernel/qplatformintegration_qpa.cpp @@ -102,6 +102,9 @@ QPlatformFontDatabase *QPlatformIntegration::fontDatabase() const \sa QPlatformClipboard */ + +#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QPlatformIntegration::clipboard() const { static QPlatformClipboard *clipboard = 0; @@ -111,6 +114,8 @@ QPlatformClipboard *QPlatformIntegration::clipboard() const return clipboard; } +#endif + QPlatformNativeInterface * QPlatformIntegration::nativeInterface() const { return 0; diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h index 1d69af4..357e4de 100644 --- a/src/gui/kernel/qplatformintegration_qpa.h +++ b/src/gui/kernel/qplatformintegration_qpa.h @@ -86,7 +86,9 @@ public: //Deeper window system integrations virtual QPlatformFontDatabase *fontDatabase() const; +#ifndef QT_NO_CLIPBOARD virtual QPlatformClipboard *clipboard() const; +#endif // Experimental in mainthread eventloop integration // This should only be used if it is only possible to do window system event processing in |