[Pkg-owncloud-commits] [owncloud-client] 302/498: Qt4 build: Qt::ItemNeverHasChildren was added in Qt 5.1

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit cdb88d621c9ea9631719e02b17d5ece1aaad1593
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Jul 14 15:01:33 2015 +0200

    Qt4 build:  Qt::ItemNeverHasChildren was added in Qt 5.1
---
 src/gui/folderstatusmodel.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 55631db..c43bc34 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -70,13 +70,17 @@ Qt::ItemFlags FolderStatusModel::flags ( const QModelIndex &index  ) const
 {
     switch (classify(index)) {
         case AddButton: {
+            Qt::ItemFlags ret;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
+            ret = Qt::ItemNeverHasChildren;
+#endif
             if (_folders.count() == 1 && _folders.at(0)._folder->remotePath() == QLatin1String("/")) {
                 // special case when syncing the entire owncloud: disable the add folder button (#3438)
-                return Qt::ItemNeverHasChildren;
+                return ret;
             } else if (!_accountState->isConnected()) {
-                return Qt::ItemNeverHasChildren;
+                return ret;
             }
-            return Qt::ItemIsEnabled | Qt::ItemNeverHasChildren;
+            return Qt::ItemIsEnabled | ret;
         }
         case RootFolder:
             return Qt::ItemIsSelectable | Qt::ItemIsEnabled;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git