diff options
| author | Mike Gelfand <mikedld@mikedld.com> | 2015-12-29 01:54:51 +0300 |
|---|---|---|
| committer | Mike Gelfand <mikedld@mikedld.com> | 2016-01-15 17:15:15 +0000 |
| commit | 2af645d0678afe0fa0ea214d0557c32bfbbdf93b (patch) | |
| tree | 0e9743540f2290bab92ce36d4ecc8c6e98f248ba | |
| parent | 9893cff4d834c9bef1ecf9b853d261ed144e16dc (diff) | |
| download | qtactiveqt-2af645d0678afe0fa0ea214d0557c32bfbbdf93b.tar.gz | |
Fix use of QAxFactory with QT_NO_CAST_FROM_ASCII defined
When QT_NO_CAST_FROM_ASCII is defined, including QAxFactory causes
compilation error because of passing char pointer directly to QString
constructor. Since the char pointer points to C++ class name, construct
QLatin1String instead to resolve encoding ambiguity.
Task-number: QTBUG-50182
Change-Id: I2e815078155e6de509f3f1220fa449f605cccefe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| -rw-r--r-- | src/activeqt/control/qaxfactory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index 6d86a4e..0ae6cd4 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.h @@ -189,7 +189,7 @@ public: {} const QMetaObject *metaObject(const QString &) const { return &T::staticMetaObject; } - QStringList featureList() const { return QStringList(QString(T::staticMetaObject.className())); } + QStringList featureList() const { return QStringList(QLatin1String(T::staticMetaObject.className())); } QObject *createObject(const QString &key) { const QMetaObject &mo = T::staticMetaObject; |