X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Ftopicwidget.cpp;h=b449f12ae8fe84b573653582c42cd8293b6c949a;hb=8fe8accd73abf77ab21d2d1c1346d2bc5c4de2ff;hp=95d6284bd4619690188ff3de275ea46cb1eab45a;hpb=e50ae7a06fc4e5d3a911c361d30953410deab609;p=quassel.git

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index 95d6284b..b449f12a 100644
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -281,6 +281,9 @@ QString TopicWidget::sanitizeTopic(const QString& topic)
     // some unicode characters with a new line, which then triggers
     // a stack overflow later
     QString result(topic);
+#if QT_VERSION >= 0x050000
+    result.replace(QChar::CarriageReturn, " ");
+#endif
     result.replace(QChar::ParagraphSeparator, " ");
     result.replace(QChar::LineSeparator, " ");