Merge pull request #10090 from qgis/backport-10081-to-release-3_4

[Backport release-3_4] [maptips] restore wrapping of the long lines (fix #21388)
qgis · May 24, 2019 · ca0b739 · ca0b739
2 parents c16a98d + a87b46b
commit ca0b739
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp
@@ -106,7 +106,7 @@ void QgsMapTip::showMapTip( QgsMapLayer *pLayer,
 
   backgroundColor = mWidget->palette().base().color().name();
   strokeColor = mWidget->palette().shadow().color().name();
-  mWidget->setStyleSheet( QString(
+  mWidget->setStyleSheet( QStringLiteral(
                             ".QWidget{"
                             "border: 1px solid %1;"
                             "background-color: %2;}" ).arg(
@@ -126,17 +126,16 @@ void QgsMapTip::showMapTip( QgsMapLayer *pLayer,
     return;
   }
 
-  bodyStyle = QString(
+  bodyStyle = QStringLiteral(
                 "background-color: %1;"
                 "margin: 0;"
-                "white-space: nowrap;"
                 "font: %2pt \"%3\";" ).arg( backgroundColor ).arg( mFontSize ).arg( mFontFamily );
 
-  containerStyle = QString(
+  containerStyle = QStringLiteral(
                      "display: inline-block;"
                      "margin: 0px" );
 
-  tipHtml = QString(
+  tipHtml = QStringLiteral(
               "<html>"
               "<body style='%1'>"
               "<div id='QgsWebViewContainer' style='%2'>%3</div>"