1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtCore/qmake: drop some unneeded QChar -> QString conversions

Browse Source 
Change-Id: Id2fb5089b0ec51073efb846b59ecc63942cfb60d
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2015-10-10 10:00:32 +02:00
parent c8cd9f1b9a
commit 48663eafd3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/projectgenerator.cpp
View File

@ -166,7 +166,7 @@ ProjectGenerator::init()
QString nd = newdir;
if(nd == ".")
nd = "";
else if(!nd.isEmpty() && !nd.endsWith(QString(QChar(QDir::separator()))))
else if (!nd.isEmpty() && !nd.endsWith(QDir::separator()))
nd += QDir::separator();
nd += profiles[i];
fileFixify(nd);

2
src/corelib/kernel/qvariant.cpp
View File

@ -413,7 +413,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
QString *str = static_cast<QString *>(result);
switch (d->type) {
case QVariant::Char:
*str = QString(*v_cast<QChar>(d));
*str = *v_cast<QChar>(d);
break;
case QMetaType::Char:
case QMetaType::SChar: