[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim-runtime] resources: Merge branch 'Applications/15.08'
From:       Dan_Vrátil <dvratil () redhat ! com>
Date:       2015-10-03 12:47:02
Message-ID: E1ZiMDO-0003gn-LR () scm ! kde ! org
[Download RAW message or body]

Git commit be1f863f670399cc01dff62782a7bec360b680a5 by Dan Vr=C3=A1til.
Committed on 03/10/2015 at 12:46.
Pushed by dvratil into branch 'master'.

Merge branch 'Applications/15.08'

M  +2    -2    resources/imap/retrieveitemstask.cpp
M  +1    -1    resources/shared/singlefileresource/singlefileresource.h

http://commits.kde.org/kdepim-runtime/be1f863f670399cc01dff62782a7bec360b68=
0a5

diff --cc resources/shared/singlefileresource/singlefileresource.h
index 7b34aa2,8dde268..c2ffe7d
--- a/resources/shared/singlefileresource/singlefileresource.h
+++ b/resources/shared/singlefileresource/singlefileresource.h
@@@ -50,10 -50,10 +50,10 @@@ class AKONADI_SINGLEFILERESOURCE_EXPOR
  public:
      SingleFileResource(const QString &id)
          : SingleFileResourceBase(id)
 -        , mSettings(new Settings(componentData().config()))
 +        , mSettings(new Settings(config()))
      {
          // The resource needs network when the path refers to a non local=
 file.
-         setNeedsNetwork(!QUrl::fromLocalFile(mSettings->path()).isLocalFi=
le());
+         setNeedsNetwork(!QUrl(mSettings->path()).isLocalFile());
      }
      ~SingleFileResource()
      {
[prev in list] [next in list] [prev in thread] [next in thread]