summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2015-10-18 03:42:07 +0200
committerDavide Pesavento <pesa@gentoo.org>2015-10-18 03:48:17 +0200
commit24a9fd87a6d73a113facd6c3c73383ca43ac778b (patch)
tree732ca6bf8d1737bb40f2534ea838f0d501ea7b46 /dev-qt/qt-creator/files
parentdev-util/qbs: remove old (diff)
downloadgentoo-24a9fd87a6d73a113facd6c3c73383ca43ac778b.tar.gz
gentoo-24a9fd87a6d73a113facd6c3c73383ca43ac778b.tar.bz2
gentoo-24a9fd87a6d73a113facd6c3c73383ca43ac778b.zip
dev-qt/qt-creator: bump to 3.5.1
Fixed also bug 560398 and 563312 Package-Manager: portage-2.2.23
Diffstat (limited to 'dev-qt/qt-creator/files')
-rw-r--r--dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch b/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch
new file mode 100644
index 000000000000..c34965d6d4c2
--- /dev/null
+++ b/dev-qt/qt-creator/files/3.5.1-tst_fileutils-parentDir.patch
@@ -0,0 +1,32 @@
+From d30eeb9c9866161a16fc38fcca7ad3772d30fcc8 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Sun, 18 Oct 2015 02:43:59 +0200
+Subject: Tests: add missing column to tst_fileutils::parentDir testcase
+
+The third column was accidentally removed from one data row in
+commit 271794fbc9cbeaa3393808691742893602de6cf5
+
+Fixes the following fatal error:
+QFETCH: Requested testdata 'expectFailMessage' not available, check your _data function.
+
+Change-Id: I4a09df2e044b4dcee1ed2ffc589082a3e2601232
+---
+ tests/auto/utils/fileutils/tst_fileutils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp
+index dd02f57..0b1e502 100644
+--- a/tests/auto/utils/fileutils/tst_fileutils.cpp
++++ b/tests/auto/utils/fileutils/tst_fileutils.cpp
+@@ -62,7 +62,7 @@ void tst_fileutils::parentDir_data()
+ QTest::newRow("//") << "//" << "" << "";
+ QTest::newRow("/tmp/dir") << "/tmp/dir" << "/tmp" << "";
+ QTest::newRow("relative/path") << "relative/path" << "relative" << "";
+- QTest::newRow("relativepath") << "relativepath" << ".";
++ QTest::newRow("relativepath") << "relativepath" << "." << "";
+
+ // Windows stuff:
+ #ifdef Q_OS_WIN
+--
+2.6.2
+