diff options
Diffstat (limited to 'src/webchannel/qmetaobjectpublisher.cpp')
| -rw-r--r-- | src/webchannel/qmetaobjectpublisher.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp index 61c5144..324191e 100644 --- a/src/webchannel/qmetaobjectpublisher.cpp +++ b/src/webchannel/qmetaobjectpublisher.cpp @@ -41,7 +41,7 @@ #include <QDebug> #include <QJsonObject> #include <QJsonArray> -#ifdef QT_HAVE_QML +#ifndef QT_NO_JSVALUE #include <QJSValue> #endif #include <QUuid> @@ -491,7 +491,7 @@ QJsonValue QMetaObjectPublisher::wrapResult(const QVariant &result, QWebChannelA objectInfo[KEY_DATA] = classInfo; return objectInfo; -#ifdef QT_HAVE_QML +#ifndef QT_NO_JSVALUE } else if (result.canConvert<QJSValue>()) { // Workaround for keeping QJSValues from QVariant. // Calling QJSValue::toVariant() converts JS-objects/arrays to QVariantMap/List |