summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-03-31 12:35:12 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-04-01 10:59:42 (GMT)
commit90f18aa904c6c4371f954392cf99cbaeb404ae7d (patch)
tree5cbce6e82a7590f87c035f9417ec23bcc65d4380
parent8454a6992e8b560efc72d75be1f8dbb442093519 (diff)
downloadQt-90f18aa904c6c4371f954392cf99cbaeb404ae7d.zip
Qt-90f18aa904c6c4371f954392cf99cbaeb404ae7d.tar.gz
Qt-90f18aa904c6c4371f954392cf99cbaeb404ae7d.tar.bz2
Fix broken test on windows
stringbuilder.cpp(160) : error C2666: 'operator +' : 2 overloads have similar conversions stringbuilder.h(416): could be 'QStringBuilder<A,B> operator +<QByteArray,char[5]>(const A &,const B (&))' with [ A=QByteArray, B=char [5] ] or 'built-in C++ operator+(__int64, char [5])' while trying to match the argument list '(QByteArray, char [5])' The reason is the cast to QNoImplicitBoolCast (which is int)
-rw-r--r--tests/auto/qstringbuilder1/stringbuilder.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/qstringbuilder1/stringbuilder.cpp b/tests/auto/qstringbuilder1/stringbuilder.cpp
index 30d1ba3..3c8ddc2 100644
--- a/tests/auto/qstringbuilder1/stringbuilder.cpp
+++ b/tests/auto/qstringbuilder1/stringbuilder.cpp
@@ -155,10 +155,6 @@ void runScenario()
const char *mmh = "test\0foo";
QCOMPARE(QByteArray(ba P mmh P ba), testWith0);
- char mmh2[5];
- strncpy(mmh2, mmh, 5);
- QCOMPARE(QByteArray(ba P mmh2 P ba), testWith0);
-
QByteArray raw = QByteArray::fromRawData(UTF8_LITERAL_EXTRA, UTF8_LITERAL_LEN);
QByteArray r = "hello" P raw;
QByteArray r2 = "hello" UTF8_LITERAL;