Fixing backlog timestamps when merging from sqlite.

[quassel.git] / src / qtui / chatscene.cpp

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 4fdf92a..2f145e9 100644 (file)
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -24,7 +24,10 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>
 #include <QPersistentModelIndex>
-#include <QWebView>
+
+#ifdef HAVE_WEBKIT
+#  include <QWebView>
+#endif
 
 #include "chatitem.h"
 #include "chatline.h"
@@ -708,7 +711,12 @@ void ChatScene::selectionToClipboard(QClipboard::Mode mode) {
   stringToClipboard(selection(), mode);
 }
 
-void ChatScene::stringToClipboard(const QString &str, QClipboard::Mode mode) {
+void ChatScene::stringToClipboard(const QString &str_, QClipboard::Mode mode) {
+  QString str = str_;
+  // remove trailing linefeeds
+  if(str.endsWith('\n'))
+    str.chop(1);
+
   switch(mode) {
     case QClipboard::Clipboard:
       QApplication::clipboard()->setText(str);