diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-10-10 10:00:32 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-10-11 12:29:28 +0000 |
| commit | 48663eafd3521eadcd6094178afa75909dc3c09e (patch) | |
| tree | 04824e682d487ff676bde3423b0d5c0c0c20d461 | |
| parent | c8cd9f1b9a3d338a12bdccce957d74d515eb9c32 (diff) | |
QtCore/qmake: drop some unneeded QChar -> QString conversions
Change-Id: Id2fb5089b0ec51073efb846b59ecc63942cfb60d
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| -rw-r--r-- | qmake/generators/projectgenerator.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 9b1796c45d..7d042ce66c 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -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); diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 35f178e6a9..fdcbdb1c45 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -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: |