[Pkg-owncloud-commits] [owncloud-client] 303/498: Qt4 test build: QTemporaryDir only exist since Qt5

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Aug 11 14:49:01 UTC 2015


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 371fc0ffa2cb283cbff2148cbc21fd310064b710
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Jul 14 15:06:42 2015 +0200

    Qt4 test build: QTemporaryDir only exist since Qt5
    
    Disable that test for older versions of Qt
---
 test/testfolderman.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/testfolderman.h b/test/testfolderman.h
index d6cfac2..cb5b93e 100644
--- a/test/testfolderman.h
+++ b/test/testfolderman.h
@@ -7,7 +7,10 @@
 
 #pragma once
 
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
 #include <QTemporaryDir>
+#endif
 #include <QtTest>
 
 #include "utility.h"
@@ -35,6 +38,7 @@ class TestFolderMan: public QObject
 private slots:
     void testCheckPathValidityForNewFolder()
     {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
         QTemporaryDir dir;
         QVERIFY(dir.isValid());
         QDir dir2(dir.path());
@@ -81,6 +85,9 @@ private slots:
         QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/link3").isNull());
         QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/link4").isNull());
         QVERIFY(!folderman->checkPathValidityForNewFolder(dir.path() + "/link3/folder").isNull());
+#else
+        QSKIP("Test not supported with Qt4", SkipSingle);
+#endif
     }
 };
 

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



More information about the Pkg-owncloud-commits mailing list