From 6150c12907c5331898d81ae7563ceef8f2e1eed9 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Mon, 11 Jul 2011 21:45:56 +0200
Subject: [PATCH] prevent triggering a crash in Qt's text layouting

also simplifies code as a fun side effect.
---
 private/tooltip.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/private/tooltip.cpp b/private/tooltip.cpp
index e3fd73c94..20c4ee03d 100644
--- a/private/tooltip.cpp
+++ b/private/tooltip.cpp
@@ -56,10 +56,6 @@ public:
           m_toolTip(parent),
           m_document(new QTextDocument(this))
     {
-        //d->text->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-//        QTextOption op;
-//        op.setWrapMode(QTextOption::WordWrap);
-//        m_document->setDefaultTextOption(op);
     }
 
     void setStyleSheet(const QString &css)
@@ -71,18 +67,16 @@ public:
     {
         QString html;
         if (!data.mainText().isEmpty()) {
-            html.append("<b>" + data.mainText() + "</b>");
-
-            if (!data.subText().isEmpty()) {
-                html.append("<br>");
-            }
+            html.append("<div><b>" + data.mainText() + "</b></div>");
         }
         html.append(data.subText());
 
         m_anchor.clear();
         m_document->clear();
         data.registerResources(m_document);
-        m_document->setHtml("<p>" + html + "</p>");
+        if (!html.isEmpty()) {
+            m_document->setHtml("<p>" + html + "</p>");
+        }
         m_document->adjustSize();
 
         m_haloRects.clear();