[Pkg-owncloud-commits] [owncloud-client] 183/332: Define Q_DECL_OVERRIDE for Qt4

[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 846773efd35ad2be371eb3537e30c053419d1270
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Jul 9 23:10:07 2014 +0200

    Define Q_DECL_OVERRIDE for Qt4
    
    That macro is new in Qt5, define it as well when compiling with Qt4
    so we can use it in mirall
    
    Note: QNetworkCookieJar::deleteCookie was not existing in Qt4.
---
 cmake/modules/QtVersionAbstraction.cmake | 2 ++
 src/mirall/cookiejar.h                   | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake
index 406519a..6e6e168 100644
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -148,6 +148,8 @@ if(NOT Qt5Core_FOUND)
 
         include( ${QT_USE_FILE} )
     endmacro()
+
+    add_definitions("-DQ_DECL_OVERRIDE=override")
 endif()
 
 if( Qt5Core_DIR )
diff --git a/src/mirall/cookiejar.h b/src/mirall/cookiejar.h
index acb0c31..3166b54 100644
--- a/src/mirall/cookiejar.h
+++ b/src/mirall/cookiejar.h
@@ -29,7 +29,11 @@ public:
     bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url) Q_DECL_OVERRIDE;
     QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const Q_DECL_OVERRIDE;
 
-    virtual bool deleteCookie(const QNetworkCookie & cookie) Q_DECL_OVERRIDE;
+    bool deleteCookie(const QNetworkCookie & cookie)
+#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+        Q_DECL_OVERRIDE //that function is not virtual in Qt4
+#endif
+    ;
     void clearSessionCookies();
 
 signals:

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