From: Albert Astals Cid <aacid@kde.org>
Date: Sat, 21 Jan 2017 00:38:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/Applications/16.12'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a67dab505adfc6a7a0c08f21d1dd1ead046e044c?hp=-c

Merge remote-tracking branch 'origin/Applications/16.12'
---

a67dab505adfc6a7a0c08f21d1dd1ead046e044c
diff --combined src/kitemviews/private/kbaloorolesprovider.cpp
index 9f151df92,2ce1f7bf6..16e3935ca
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@@ -138,7 -138,6 +138,7 @@@ KBalooRolesProvider::KBalooRolesProvide
          { "rating", "rating" },
          { "tag",        "tags" },
          { "comment",   "comment" },
 +        { "title",         "title" },
          { "wordCount",     "wordCount" },
          { "lineCount",     "lineCount" },
          { "width",         "imageSize" },
@@@ -182,7 -181,7 +182,7 @@@ QString KBalooRolesProvider::orientatio
  
  QString KBalooRolesProvider::durationFromValue(int value) const
  {
-     QTime duration;
+     QTime duration(0, 0, 0);
      duration = duration.addSecs(value);
      return duration.toString(QStringLiteral("hh:mm:ss"));
  }