From 1df4b2a3609d977cc8123f1f82e454d0333287d4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 7 Oct 2016 11:11:24 +0200 Subject: fix build with QT_NO_CAST_FROM_ASCII necessary for use outside qmake itself. amends f137957e08. Change-Id: Ie069f7b6efc969ab112e1f0ecd966eb06248fb94 Reviewed-by: Maurice Kalinowski --- qmake/library/proitems.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qmake/library') diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h index a3d2c01760..05d9e8da28 100644 --- a/qmake/library/proitems.h +++ b/qmake/library/proitems.h @@ -208,9 +208,9 @@ inline QString operator+(const QString &one, const ProString &two) { return ProString(one) + two; } inline QString operator+(const ProString &one, const char *two) - { QString ret = one.toQStringRef() + two; ret.detach(); return ret; } + { QString ret = one.toQStringRef() + QLatin1String(two); ret.detach(); return ret; } inline QString operator+(const char *one, const ProString &two) - { QString ret = one + two.toQStringRef(); ret.detach(); return ret; } + { QString ret = QLatin1String(one) + two.toQStringRef(); ret.detach(); return ret; } inline QString operator+(const ProString &one, QChar two) { return one.toQStringRef() + two; } inline QString operator+(QChar one, const ProString &two) -- cgit v1.2.3