From: Nate Graham <nate@kde.org>
Date: Sun, 17 Feb 2019 21:07:49 +0000 (-0700)
Subject: Merge branch 'Applications/18.12'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/6e88d7cef072e1b504f5d428a2ce7d8aff736a8d?hp=-c

Merge branch 'Applications/18.12'
---

6e88d7cef072e1b504f5d428a2ce7d8aff736a8d
diff --combined src/dolphinviewcontainer.cpp
index 012908162,4d808d023..767f2ae8f
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@@ -40,6 -40,7 +40,6 @@@
  #include <KShell>
  #include <KUrlComboBox>
  #include <KUrlNavigator>
 -#include <kio_version.h>
  
  #include <QDropEvent>
  #include <QLoggingCategory>
@@@ -311,6 -312,10 +311,10 @@@ void DolphinViewContainer::showMessage(
  
      m_messageWidget->setText(msg);
  
+     // TODO: wrap at arbitrary character positions once QLabel can do this
+     // https://bugreports.qt.io/browse/QTBUG-1276
+     m_messageWidget->setWordWrap(true);
+ 
      switch (type) {
      case Information: m_messageWidget->setMessageType(KMessageWidget::Information); break;
      case Warning:     m_messageWidget->setMessageType(KMessageWidget::Warning); break;