diff options
27 files changed, 64 insertions, 61 deletions
diff --git a/.qmake.conf b/.qmake.conf index 6b03aa4..8f723f8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.14.2 +MODULE_VERSION = 5.15.0 diff --git a/examples/script/context2d/context2d.cpp b/examples/script/context2d/context2d.cpp index 5b8b9f6..beaa717 100644 --- a/examples/script/context2d/context2d.cpp +++ b/examples/script/context2d/context2d.cpp @@ -245,7 +245,7 @@ void Context2D::translate(qreal x, qreal y) void Context2D::transform(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy) { - QMatrix mat(m11, m12, + QTransform mat(m11, m12, m21, m22, dx, dy); m_state.matrix *= mat; @@ -256,7 +256,7 @@ void Context2D::transform(qreal m11, qreal m12, qreal m21, qreal m22, void Context2D::setTransform(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy) { - QMatrix mat(m11, m12, + QTransform mat(m11, m12, m21, m22, dx, dy); m_state.matrix = mat; @@ -730,7 +730,7 @@ void Context2D::clear() void Context2D::reset() { m_stateStack.clear(); - m_state.matrix = QMatrix(); + m_state.matrix = QTransform(); m_state.clipPath = QPainterPath(); m_state.globalAlpha = 1.0; m_state.globalCompositeOperation = QPainter::CompositionMode_SourceOver; diff --git a/examples/script/context2d/context2d.h b/examples/script/context2d/context2d.h index f7f8722..108e6b5 100644 --- a/examples/script/context2d/context2d.h +++ b/examples/script/context2d/context2d.h @@ -244,7 +244,7 @@ private: struct State { State() : flags(0) {} - QMatrix matrix; + QTransform matrix; QPainterPath clipPath; QBrush strokeStyle; QBrush fillStyle; diff --git a/examples/script/customclass/bytearrayclass.cpp b/examples/script/customclass/bytearrayclass.cpp index 51c65c7..6adef37 100644 --- a/examples/script/customclass/bytearrayclass.cpp +++ b/examples/script/customclass/bytearrayclass.cpp @@ -114,14 +114,14 @@ QScriptClass::QueryFlags ByteArrayClass::queryProperty(const QScriptValue &objec { QByteArray *ba = qscriptvalue_cast<QByteArray*>(object.data()); if (!ba) - return 0; + return {}; if (name == length) { return flags; } else { bool isArrayIndex; qint32 pos = name.toArrayIndex(&isArrayIndex); if (!isArrayIndex) - return 0; + return {}; *id = pos; if ((flags & HandlesReadAccess) && (pos >= ba->size())) flags &= ~HandlesReadAccess; diff --git a/src/script/api/qscriptclass.cpp b/src/script/api/qscriptclass.cpp index 01657af..732dab4 100644 --- a/src/script/api/qscriptclass.cpp +++ b/src/script/api/qscriptclass.cpp @@ -252,7 +252,7 @@ QScriptClass::QueryFlags QScriptClass::queryProperty( Q_UNUSED(name); Q_UNUSED(flags); Q_UNUSED(id); - return 0; + return {}; } /*! @@ -292,7 +292,7 @@ QScriptValue::PropertyFlags QScriptClass::propertyFlags( Q_UNUSED(object); Q_UNUSED(name); Q_UNUSED(id); - return 0; + return {}; } /*! diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 2cf25ab..a18c2fe 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1348,8 +1348,10 @@ void QScriptEnginePrivate::collectGarbage() void QScriptEnginePrivate::reportAdditionalMemoryCost(int size) { - if (size > 0) + if (size > 0) { + QScript::APIShim shim(this); globalData->heap.reportExtraMemoryCost(size); + } } QScript::TimeoutCheckerProxy *QScriptEnginePrivate::timeoutChecker() const @@ -2004,9 +2006,9 @@ QScriptValue::PropertyFlags QScriptEnginePrivate::propertyFlags(JSC::ExecState * JSC::JSValue proto = object->prototype(); return propertyFlags(exec, proto, id, mode); } - return 0; + return {}; } - QScriptValue::PropertyFlags result = 0; + QScriptValue::PropertyFlags result; if (attribs & JSC::ReadOnly) result |= QScriptValue::ReadOnly; if (attribs & JSC::DontEnum) diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h index cc0dcc5..73387e5 100644 --- a/src/script/api/qscriptengine_p.h +++ b/src/script/api/qscriptengine_p.h @@ -345,7 +345,7 @@ public: void markQObjectData(JSC::MarkStack&); JSC::JSValue newQObject(QObject *object, QScriptEngine::ValueOwnership ownership = QScriptEngine::QtOwnership, - const QScriptEngine:: QObjectWrapOptions &options = 0); + const QScriptEngine:: QObjectWrapOptions &options = {}); JSC::JSValue newQMetaObject(const QMetaObject *metaObject, JSC::JSValue ctor); diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index 6b192dd..7c37c4d 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -1523,7 +1523,7 @@ QScriptValue::PropertyFlags QScriptValue::propertyFlags(const QString &name, { Q_D(const QScriptValue); if (!d || !d->isObject()) - return 0; + return {}; QScript::APIShim shim(d->engine); JSC::ExecState *exec = d->engine->currentFrame; return d->propertyFlags(JSC::Identifier(exec, name), mode); @@ -1543,7 +1543,7 @@ QScriptValue::PropertyFlags QScriptValue::propertyFlags(const QScriptString &nam { Q_D(const QScriptValue); if (!d || !d->isObject() || !QScriptStringPrivate::isValid(name)) - return 0; + return {}; return d->propertyFlags(name.d_ptr->identifier, mode); } diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp index 826f5ad..0315e48 100644 --- a/src/script/api/qscriptvalueiterator.cpp +++ b/src/script/api/qscriptvalueiterator.cpp @@ -339,7 +339,7 @@ QScriptValue::PropertyFlags QScriptValueIterator::flags() const { Q_D(const QScriptValueIterator); if (!d || !d->initialized || !d->engine()) - return 0; + return {}; QScript::APIShim shim(d->engine()); return d->object()->propertyFlags(*d->current); } diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp index ba8ff72..6e99335 100644 --- a/src/script/bridge/qscriptdeclarativeclass.cpp +++ b/src/script/bridge/qscriptdeclarativeclass.cpp @@ -503,7 +503,7 @@ QScriptDeclarativeClass::queryProperty(Object *object, const Identifier &name, Q_UNUSED(object); Q_UNUSED(name); Q_UNUSED(flags); - return 0; + return {}; } QScriptDeclarativeClass::Value @@ -527,7 +527,7 @@ QScriptDeclarativeClass::propertyFlags(Object *object, const Identifier &name) { Q_UNUSED(object); Q_UNUSED(name); - return 0; + return {}; } QScriptDeclarativeClass::Value QScriptDeclarativeClass::call(Object *object, diff --git a/src/scripttools/debugging/qscriptbreakpointsmodel.cpp b/src/scripttools/debugging/qscriptbreakpointsmodel.cpp index 7f56a09..90acb76 100644 --- a/src/scripttools/debugging/qscriptbreakpointsmodel.cpp +++ b/src/scripttools/debugging/qscriptbreakpointsmodel.cpp @@ -472,7 +472,7 @@ QVariant QScriptBreakpointsModel::headerData(int section, Qt::Orientation orient Qt::ItemFlags QScriptBreakpointsModel::flags(const QModelIndex &index) const { if (!index.isValid()) - return 0; + return {}; Qt::ItemFlags ret = QAbstractItemModel::flags(index); switch (index.column()) { case 0: diff --git a/src/scripttools/debugging/qscriptbreakpointswidget.cpp b/src/scripttools/debugging/qscriptbreakpointswidget.cpp index 51059e2..a227390 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidget.cpp +++ b/src/scripttools/debugging/qscriptbreakpointswidget.cpp @@ -272,7 +272,7 @@ private Q_SLOTS: }; QScriptBreakpointsWidget::QScriptBreakpointsWidget(QWidget *parent) - : QScriptBreakpointsWidgetInterface(*new QScriptBreakpointsWidgetPrivate, parent, 0) + : QScriptBreakpointsWidgetInterface(*new QScriptBreakpointsWidgetPrivate, parent, {}) { Q_D(QScriptBreakpointsWidget); d->view = new QTreeView(); diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp index a538234..4d73af8 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp @@ -121,7 +121,7 @@ void QScriptDebuggerCodeFinderWidgetPrivate::_q_previous() QScriptDebuggerCodeFinderWidget::QScriptDebuggerCodeFinderWidget(QWidget *parent) : QScriptDebuggerCodeFinderWidgetInterface( - *new QScriptDebuggerCodeFinderWidgetPrivate, parent, 0) + *new QScriptDebuggerCodeFinderWidgetPrivate, parent, {}) { Q_D(QScriptDebuggerCodeFinderWidget); QString system = QLatin1String("win"); diff --git a/src/scripttools/debugging/qscriptdebuggercodeview.cpp b/src/scripttools/debugging/qscriptdebuggercodeview.cpp index 19545b6..02caeda 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeview.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodeview.cpp @@ -68,7 +68,7 @@ QScriptDebuggerCodeViewPrivate::~QScriptDebuggerCodeViewPrivate() } QScriptDebuggerCodeView::QScriptDebuggerCodeView(QWidget *parent) - : QScriptDebuggerCodeViewInterface(*new QScriptDebuggerCodeViewPrivate, parent, 0) + : QScriptDebuggerCodeViewInterface(*new QScriptDebuggerCodeViewPrivate, parent, {}) { Q_D(QScriptDebuggerCodeView); d->editor = new QScriptEdit(); diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp index 23e1bf6..f0d6af0 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp @@ -198,7 +198,7 @@ void QScriptDebuggerCodeWidgetPrivate::_q_onToolTipRequest( } QScriptDebuggerCodeWidget::QScriptDebuggerCodeWidget(QWidget *parent) - : QScriptDebuggerCodeWidgetInterface(*new QScriptDebuggerCodeWidgetPrivate, parent, 0) + : QScriptDebuggerCodeWidgetInterface(*new QScriptDebuggerCodeWidgetPrivate, parent, {}) { Q_D(QScriptDebuggerCodeWidget); QVBoxLayout *vbox = new QVBoxLayout(this); diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp index 5cf68b6..712cb85 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp @@ -315,7 +315,7 @@ void QScriptDebuggerConsoleWidgetPrivate::_q_onCompletionTaskFinished() } QScriptDebuggerConsoleWidget::QScriptDebuggerConsoleWidget(QWidget *parent) - : QScriptDebuggerConsoleWidgetInterface(*new QScriptDebuggerConsoleWidgetPrivate, parent, 0) + : QScriptDebuggerConsoleWidgetInterface(*new QScriptDebuggerConsoleWidgetPrivate, parent, {}) { Q_D(QScriptDebuggerConsoleWidget); d->commandLine = new CommandLine(); diff --git a/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp b/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp index 25ca0fb..7578b51 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp +++ b/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp @@ -462,7 +462,7 @@ QModelIndex QScriptDebuggerLocalsModelPrivate::addTopLevelObject(const QString & return indexFromNode(node); QScriptDebuggerValueProperty prop(name, object, QString::fromLatin1(""), // ### string representation of object - /*flags=*/0); + QScriptValue::PropertyFlags{}); int rowIndex = invisibleRootNode->children.size(); q->beginInsertRows(QModelIndex(), rowIndex, rowIndex); node = new QScriptDebuggerLocalsModelNode(prop, invisibleRootNode); @@ -907,7 +907,7 @@ Qt::ItemFlags QScriptDebuggerLocalsModel::flags(const QModelIndex &index) const { Q_D(const QScriptDebuggerLocalsModel); if (!index.isValid()) - return 0; + return {}; Qt::ItemFlags ret = QAbstractItemModel::flags(index); if ((index.column() == 1) && index.parent().isValid()) { QScriptDebuggerLocalsModelNode *node = d->nodeFromIndex(index); diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp index 3f11c87..ec268e3 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp @@ -343,7 +343,7 @@ void QScriptDebuggerLocalsItemDelegate::paint(QPainter *painter, const QStyleOpt } QScriptDebuggerLocalsWidget::QScriptDebuggerLocalsWidget(QWidget *parent) - : QScriptDebuggerLocalsWidgetInterface(*new QScriptDebuggerLocalsWidgetPrivate, parent, 0) + : QScriptDebuggerLocalsWidgetInterface(*new QScriptDebuggerLocalsWidgetPrivate, parent, {}) { Q_D(QScriptDebuggerLocalsWidget); d->view = new QTreeView(); diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp b/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp index 1ded58b..ac134a0 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp @@ -94,7 +94,7 @@ void QScriptDebuggerScriptsWidgetPrivate::_q_onCurrentChanged(const QModelIndex } QScriptDebuggerScriptsWidget::QScriptDebuggerScriptsWidget(QWidget *parent) - : QScriptDebuggerScriptsWidgetInterface(*new QScriptDebuggerScriptsWidgetPrivate, parent, 0) + : QScriptDebuggerScriptsWidgetInterface(*new QScriptDebuggerScriptsWidgetPrivate, parent, {}) { Q_D(QScriptDebuggerScriptsWidget); d->view = new QTreeView(); diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp b/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp index f72968b..d851f0b 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp @@ -76,7 +76,7 @@ void QScriptDebuggerStackWidgetPrivate::_q_onCurrentChanged(const QModelIndex &i } QScriptDebuggerStackWidget::QScriptDebuggerStackWidget(QWidget *parent) - : QScriptDebuggerStackWidgetInterface(*new QScriptDebuggerStackWidgetPrivate, parent, 0) + : QScriptDebuggerStackWidgetInterface(*new QScriptDebuggerStackWidgetPrivate, parent, {}) { Q_D(QScriptDebuggerStackWidget); d->view = new QTreeView(); diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp index f46d3dd..6fed959 100644 --- a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp +++ b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp @@ -160,7 +160,7 @@ QScriptValue::PropertyFlags QScriptDebuggerValueProperty::flags() const { Q_D(const QScriptDebuggerValueProperty); if (!d) - return 0; + return {}; return d->flags; } diff --git a/src/scripttools/debugging/qscriptdebugoutputwidget.cpp b/src/scripttools/debugging/qscriptdebugoutputwidget.cpp index a522519..f6b3fa3 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidget.cpp +++ b/src/scripttools/debugging/qscriptdebugoutputwidget.cpp @@ -95,7 +95,7 @@ QScriptDebugOutputWidgetPrivate::~QScriptDebugOutputWidgetPrivate() } QScriptDebugOutputWidget::QScriptDebugOutputWidget(QWidget *parent) - : QScriptDebugOutputWidgetInterface(*new QScriptDebugOutputWidgetPrivate, parent, 0) + : QScriptDebugOutputWidgetInterface(*new QScriptDebugOutputWidgetPrivate, parent, {}) { Q_D(QScriptDebugOutputWidget); d->outputEdit = new QScriptDebugOutputWidgetOutputEdit(); diff --git a/src/scripttools/debugging/qscripterrorlogwidget.cpp b/src/scripttools/debugging/qscripterrorlogwidget.cpp index 165f0fd..3fd636d 100644 --- a/src/scripttools/debugging/qscripterrorlogwidget.cpp +++ b/src/scripttools/debugging/qscripterrorlogwidget.cpp @@ -90,7 +90,7 @@ QScriptErrorLogWidgetPrivate::~QScriptErrorLogWidgetPrivate() } QScriptErrorLogWidget::QScriptErrorLogWidget(QWidget *parent) - : QScriptErrorLogWidgetInterface(*new QScriptErrorLogWidgetPrivate, parent, 0) + : QScriptErrorLogWidgetInterface(*new QScriptErrorLogWidgetPrivate, parent, {}) { Q_D(QScriptErrorLogWidget); d->outputEdit = new QScriptErrorLogWidgetOutputEdit(); diff --git a/src/scripttools/debugging/qscriptvalueproperty.cpp b/src/scripttools/debugging/qscriptvalueproperty.cpp index 8f710cd..feebd82 100644 --- a/src/scripttools/debugging/qscriptvalueproperty.cpp +++ b/src/scripttools/debugging/qscriptvalueproperty.cpp @@ -141,7 +141,7 @@ QScriptValue::PropertyFlags QScriptValueProperty::flags() const { Q_D(const QScriptValueProperty); if (!d) - return 0; + return {}; return d->flags; } diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp index d7b9440..40b900e 100644 --- a/tests/auto/qscriptclass/tst_qscriptclass.cpp +++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp @@ -275,7 +275,7 @@ QScriptClass::QueryFlags TestClass::queryProperty(const QScriptValue &object, m_lastQueryPropertyFlags = flags; CustomProperty *prop = findCustomProperty(name); if (!prop) - return 0; + return {}; *id = prop->id; return prop->qflags & flags; } @@ -318,14 +318,14 @@ QScriptValue::PropertyFlags TestClass::propertyFlags( m_lastPropertyFlagsId = id; CustomProperty *prop = findCustomProperty(name); if (!prop) - return 0; + return {}; return prop->pflags; } QScriptClassPropertyIterator *TestClass::newIterator(const QScriptValue &object) { if (!m_iterationEnabled) - return 0; + return {}; return new TestClassPropertyIterator(customProperties, object); } @@ -469,7 +469,7 @@ void TestClass::clearReceivedArgs() { m_lastQueryPropertyObject = QScriptValue(); m_lastQueryPropertyName = QScriptString(); - m_lastQueryPropertyFlags = 0; + m_lastQueryPropertyFlags = {}; m_lastPropertyObject = QScriptValue(); m_lastPropertyName = QScriptString(); @@ -583,7 +583,7 @@ QScriptValue::PropertyFlags TestClassPropertyIterator::flags() const { QScriptString key = m_props.keys().value(m_last); if (!key.isValid()) - return 0; + return {}; TestClass::CustomProperty *prop = m_props.value(key); return prop->pflags; } @@ -775,7 +775,7 @@ void tst_QScriptClass::getAndSetPropertyFromJS() cls.addCustomProperty(eng.toStringHandle("x"), QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, - /*id=*/1, /*flags=*/0, /*value=*/123); + /*id=*/ 1, QScriptValue::PropertyFlags{}, /*value=*/ 123); eng.globalObject().setProperty("o", eng.newObject(&cls)); // Accessing a custom property @@ -826,7 +826,7 @@ void tst_QScriptClass::writePropertyWithoutWriteAccess() TestClass cls(&eng); cls.addCustomProperty(eng.toStringHandle("x"), QScriptClass::HandlesReadAccess, - /*id=*/0, /*flags=*/0, 123); + /*id=*/ 0, QScriptValue::PropertyFlags{}, 123); eng.globalObject().setProperty("o", eng.newObject(&cls)); QCOMPARE(eng.evaluate("o.x").toInt32(), 123); @@ -1163,12 +1163,12 @@ void tst_QScriptClass::originalProperties1() { TestClass cls1(&eng); - cls1.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, 89); - cls1.addCustomProperty(new1, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, "hello"); + cls1.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, 89); + cls1.addCustomProperty(new1, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, "hello"); TestClass cls2(&eng); - cls2.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, 59); - cls2.addCustomProperty(new2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, "world"); + cls2.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, 59); + cls2.addCustomProperty(new2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, "world"); QScriptValue obj1 = eng.newObject(); obj1.setProperty(orig1 , 42); @@ -1233,12 +1233,12 @@ void tst_QScriptClass::originalProperties2() { TestClass cls1(&eng); - cls1.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, 89); - cls1.addCustomProperty(new1, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, "hello"); + cls1.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, 89); + cls1.addCustomProperty(new1, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, "hello"); TestClass cls2(&eng); - cls2.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, 59); - cls2.addCustomProperty(new2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, "world"); + cls2.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, 59); + cls2.addCustomProperty(new2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, "world"); QScriptValue obj1 = eng.newObject(); obj1.setProperty(orig1 , 42); @@ -1291,12 +1291,12 @@ void tst_QScriptClass::originalProperties3() { TestClass cls1(&eng); - cls1.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, 89); - cls1.addCustomProperty(new1, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, "hello"); + cls1.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, 89); + cls1.addCustomProperty(new1, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, "hello"); TestClass cls2(&eng); - cls2.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, 59); - cls2.addCustomProperty(new2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, "world"); + cls2.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, 59); + cls2.addCustomProperty(new2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, "world"); QScriptValue obj1 = eng.newObject(&cls1); QVERIFY(!obj1.property(orig1).isValid()); @@ -1346,12 +1346,12 @@ void tst_QScriptClass::originalProperties4() { TestClass cls1(&eng); - cls1.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, 89); - cls1.addCustomProperty(new1, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, "hello"); + cls1.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, 89); + cls1.addCustomProperty(new1, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, "hello"); TestClass cls2(&eng); - cls2.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, 59); - cls2.addCustomProperty(new2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, 0, "world"); + cls2.addCustomProperty(orig2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, 59); + cls2.addCustomProperty(new2, QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess, 1, {}, "world"); QScriptValue obj1 = eng.newObject(&cls1); QVERIFY(!obj1.property(orig1).isValid()); @@ -1406,9 +1406,9 @@ void tst_QScriptClass::defaultImplementations() QScriptString name = eng.toStringHandle("foo"); uint id = -1; - QCOMPARE(defaultClass.queryProperty(obj, name, QScriptClass::HandlesReadAccess, &id), QScriptClass::QueryFlags(0)); + QCOMPARE(defaultClass.queryProperty(obj, name, QScriptClass::HandlesReadAccess, &id), QScriptClass::QueryFlags{}); QVERIFY(!defaultClass.property(obj, name, id).isValid()); - QCOMPARE(defaultClass.propertyFlags(obj, name, id), QScriptValue::PropertyFlags(0)); + QCOMPARE(defaultClass.propertyFlags(obj, name, id), QScriptValue::PropertyFlags{}); defaultClass.setProperty(obj, name, id, 123); QVERIFY(!obj.property(name).isValid()); @@ -1432,7 +1432,8 @@ void tst_QScriptClass::scriptClassObjectInPrototype() eng.globalObject().setProperty("classObject", classObject); QScriptString name = eng.toStringHandle("x"); - cls.addCustomProperty(name, QScriptClass::HandlesReadAccess, /*id=*/1, /*flags=*/0, /*value=*/123); + cls.addCustomProperty(name, QScriptClass::HandlesReadAccess, /*id=*/ 1, + QScriptValue::PropertyFlags{}, /*value=*/ 123); QVERIFY(plainObject.property(name).equals(classObject.property(name))); QVERIFY(eng.evaluate("plainObject.x == classObject.x").toBool()); diff --git a/tests/auto/qscriptjstestsuite/tests/ecma/String/15.5.4.12-3.js b/tests/auto/qscriptjstestsuite/tests/ecma/String/15.5.4.12-3.js index d9d8bc6..364baf6 100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma/String/15.5.4.12-3.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma/String/15.5.4.12-3.js @@ -68,7 +68,7 @@ writeHeaderToLog( SECTION + " "+ TITLE); // Georgian // Range: U+10A0 to U+10FF -for ( var i = 0x10A0; i <= 0x10FF; i++ ) { +for ( var i = 0x10A0; i <= 0x10CF; i++ ) { // 0x10FB and 0x10FC also work var U = new Unicode( i ); /* new TestCase( SECTION, diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 0875fe6..a297198 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -2202,7 +2202,7 @@ void tst_QScriptValue::getSetProperty() // change flags object.setProperty("flagProperty", str); - QCOMPARE(object.propertyFlags("flagProperty"), static_cast<QScriptValue::PropertyFlags>(0)); + QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::PropertyFlags{}); object.setProperty("flagProperty", str, QScriptValue::ReadOnly); QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::ReadOnly); |