diff options
author | Ian Walters <ian.walters@nokia.com> | 2009-05-12 00:18:56 (GMT) |
---|---|---|
committer | Ian Walters <ian.walters@nokia.com> | 2009-05-12 00:18:56 (GMT) |
commit | a7d54ce95b9cb1cd923ea202fc7b561792003d0d (patch) | |
tree | ca33410ab469c0f10040260e1d133ba835c1017f /tests/auto/rcc | |
parent | ee533dd0818c3bf7c940cd2d543adb1c6807dd1c (diff) | |
parent | 4af513212d9ca9ed88e18bddaabd90006aca8541 (diff) | |
download | Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.zip Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.tar.gz Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.tar.bz2 |
Merge branch 'master' into contiguouscache
Diffstat (limited to 'tests/auto/rcc')
-rw-r--r-- | tests/auto/rcc/tst_rcc.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/tests/auto/rcc/tst_rcc.cpp b/tests/auto/rcc/tst_rcc.cpp index 3297b2b..57649b4 100644 --- a/tests/auto/rcc/tst_rcc.cpp +++ b/tests/auto/rcc/tst_rcc.cpp @@ -59,8 +59,6 @@ public: private slots: void rcc_data(); void rcc(); - -private: }; @@ -68,18 +66,9 @@ QString findExpectedFile(const QString &base) { QString expectedrccfile = base; - if (QT_VERSION >= 0x040500 && QFileInfo(expectedrccfile + QLatin1String(".450")).exists()) + // Must be updated with each minor release. + if (QFileInfo(expectedrccfile + QLatin1String(".450")).exists()) expectedrccfile += QLatin1String(".450"); - else if (QT_VERSION >= 0x040400 && QFileInfo(expectedrccfile + QLatin1String(".440")).exists()) - expectedrccfile += QLatin1String(".440"); - else if (QT_VERSION >= 0x040300 && QFileInfo(expectedrccfile + QLatin1String(".430")).exists()) - expectedrccfile += QLatin1String(".430"); - else if (QT_VERSION >= 0x040200 && QFileInfo(expectedrccfile + QLatin1String(".420")).exists()) - expectedrccfile += QLatin1String(".420"); - else if (QT_VERSION >= 0x040100 && QFileInfo(expectedrccfile + QLatin1String(".410")).exists()) - expectedrccfile += QLatin1String(".410"); - else if (QT_VERSION >= 0x040000 && QFileInfo(expectedrccfile + QLatin1String(".400")).exists()) - expectedrccfile += QLatin1String(".400"); return expectedrccfile; } |