diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-06-27 14:41:09 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-06-27 16:09:07 +0000 |
| commit | 4100b5296dd288707be3b8e26c2c67e3f8900d16 (patch) | |
| tree | ada599d8f1d4a553c0692ed3cc3220ee54518cad | |
| parent | 878c3ec6bcaf1219bd1e5ef301bb682f175204d2 (diff) | |
Fix build with QT_NO_CAST_FROM_ASCII.
Task-number: QTBUG-54352
Change-Id: I608a253819241d23241f9f8d37782726a1f93a03
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/activeqt/control/qaxfactory.h | 2 | ||||
| -rw-r--r-- | tools/dumpcpp/main.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index 23989e2..c7444d3 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.h @@ -227,7 +227,7 @@ private: static QStringList getImplementedCategories() { const QMetaObject &mo = T::staticMetaObject; - QString catids = mo.classInfo(mo.indexOfClassInfo("Implemented Categories")).value(); + QString catids = QLatin1String(mo.classInfo(mo.indexOfClassInfo("Implemented Categories")).value()); return catids.split(QLatin1Char(',')); } }; diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 84b8768..c4f551e 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -835,8 +835,9 @@ void generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray if (property.isEditable()) flags |= Editable; - out << "0x" << QString::number(flags, 16).rightJustified(8, '0') << ", \t\t // " << property.typeName() << ' ' << property.name(); - out << endl; + out << "0x" << QString::number(flags, 16).rightJustified(8, QLatin1Char('0')) + << ", \t\t // " << property.typeName() << ' ' << property.name() + << endl; } out << endl; } @@ -1556,7 +1557,7 @@ int main(int argc, char **argv) QSettings settings(QLatin1String("HKEY_LOCAL_MACHINE\\Software\\Classes"), QSettings::NativeFormat); // regular string and not a file - must be ProgID - if (typeLib.at(0) != '{') { + if (typeLib.at(0) != QLatin1Char('{')) { CLSID clsid; if (CLSIDFromProgID(reinterpret_cast<const wchar_t *>(typeLib.utf16()), &clsid) != S_OK) { qWarning("dumpcpp: '%s' is not a type library and not a registered ProgID", |