diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:24:04 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:24:07 +0100 |
commit | d34353a065c443aac20376cbd88323480d769183 (patch) | |
tree | da5d86b51c2cf7023356551c4c980849b35bab14 /tests/auto/corelib/io/qdir/tst_qdir.cpp | |
parent | 4e40b1952695f0b1086ef7b88e8514bd18cf96bf (diff) | |
parent | 571908f7fc8f5e4ef9a4dfd90102566f6f0fcad2 (diff) |
Merge dev into 5.5
Change-Id: Id6dbbbfc542c214fe695c6795c6aaf23aedc1cd1
Diffstat (limited to 'tests/auto/corelib/io/qdir/tst_qdir.cpp')
-rw-r--r-- | tests/auto/corelib/io/qdir/tst_qdir.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp index b93407f2e4..caa22db144 100644 --- a/tests/auto/corelib/io/qdir/tst_qdir.cpp +++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp @@ -2176,7 +2176,11 @@ void tst_QDir::cdNonreadable() void tst_QDir::cdBelowRoot() { -#if defined (Q_OS_UNIX) +#if defined (Q_OS_ANDROID) +#define ROOT QString("/") +#define DIR QString("/system") +#define CD_INTO "system" +#elif defined (Q_OS_UNIX) #define ROOT QString("/") #define DIR QString("/tmp") #define CD_INTO "tmp" |