From 90f18aa904c6c4371f954392cf99cbaeb404ae7d Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 31 Mar 2011 14:35:12 +0200 Subject: Fix broken test on windows stringbuilder.cpp(160) : error C2666: 'operator +' : 2 overloads have similar conversions stringbuilder.h(416): could be 'QStringBuilder operator +(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) --- tests/auto/qstringbuilder1/stringbuilder.cpp | 4 ---- 1 file changed, 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; -- cgit v0.12