diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-13 04:37:30 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-15 13:32:47 +0200 |
| commit | 49c97ed1bd91ef6c355d72ee3e0005c2b4b5c72d (patch) | |
| tree | 3c20d5142ab02c111231cf683e4c6d293721de09 /src/qml/jsruntime | |
| parent | 5b2ed5411059cdf72e32cc17e2cf7502c1fc093b (diff) | |
Fix build after QStringList change in qtbase
Change-Id: I258bcd59e7e97e025fa9ff77594bd8fdba0c34dd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index 9e5bb7cc2f..b78d6495e8 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -93,7 +93,6 @@ static void generateWarning(QV4::ExecutionEngine *v4, const QString& description F(int, Int, QList<int>, 0) \ F(qreal, Real, QList<qreal>, 0.0) \ F(bool, Bool, QList<bool>, false) \ - F(QString, String, QList<QString>, QString()) \ F(QString, QString, QStringList, QString()) \ F(QString, StringStdVector, std::vector<QString>, QString()) \ F(QUrl, Url, QList<QUrl>, QUrl()) \ @@ -660,8 +659,6 @@ typedef QQmlSequence<std::vector<bool> > QQmlBoolStdVectorList; DEFINE_OBJECT_TEMPLATE_VTABLE(QQmlBoolStdVectorList); typedef QQmlSequence<QStringList> QQmlQStringList; DEFINE_OBJECT_TEMPLATE_VTABLE(QQmlQStringList); -typedef QQmlSequence<QList<QString> > QQmlStringList; -DEFINE_OBJECT_TEMPLATE_VTABLE(QQmlStringList); typedef QQmlSequence<std::vector<QString> > QQmlStringStdVectorList; typedef QQmlSequence<QList<int> > QQmlIntList; DEFINE_OBJECT_TEMPLATE_VTABLE(QQmlIntList); |