diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-31 11:52:57 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-31 11:52:57 +1000 |
| commit | aa9cf406d62004519ad54596e1c391f9a6439210 (patch) | |
| tree | dd562b9c296981f2761b76623911be8496c7af84 /src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp | |
| parent | 987aec28b950e1c9817a20a9dd71afc071cd93ea (diff) | |
| parent | 56b6a5924008ab5cdbae36e9662eddba923acd5e (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp index b535a74e3..8a377ad70 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp @@ -44,8 +44,8 @@ #define methodDebug() qDebug() << "PasteboardQt: " << __FUNCTION__; namespace WebCore { - -Pasteboard::Pasteboard() + +Pasteboard::Pasteboard() : m_selectionMode(false) { } @@ -71,7 +71,7 @@ void Pasteboard::writeSelection(Range* selectedRange, bool, Frame* frame) md->setHtml(html); #ifndef QT_NO_CLIPBOARD - QApplication::clipboard()->setMimeData(md, m_selectionMode ? + QApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard); #endif } @@ -84,7 +84,7 @@ bool Pasteboard::canSmartReplace() String Pasteboard::plainText(Frame*) { #ifndef QT_NO_CLIPBOARD - return QApplication::clipboard()->text(m_selectionMode ? + return QApplication::clipboard()->text(m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard); #else return String(); |