diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-05-24 14:27:48 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-10-30 11:52:48 +0100 |
| commit | 5357231c0a10eef558cc6aebfd172048dc010a96 (patch) | |
| tree | 47d13d107665105bc93734c064b11e47ad5392e2 /tests/auto/tools/moc | |
| parent | 1299a2330ae14a6a901f574ea01fc63715e1b87d (diff) | |
Make QList an alias to QVector
This is almost 100% source compatible with Qt 5. Exceptions are
* Stability of references for large or non movable types
* taking a PMF for types that are now overloaded with r-value references
in QVector
* The missing prepend optimization in QVector (that is still planned
to come for Qt 6)
Change-Id: I96d44553304dd623def9c70d6fea8fa2fb0373b0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/tools/moc')
| -rw-r--r-- | tests/auto/tools/moc/allmocs_baseline_in.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/tools/moc/allmocs_baseline_in.json b/tests/auto/tools/moc/allmocs_baseline_in.json index bde5a1c52b..d6b5375c5b 100644 --- a/tests/auto/tools/moc/allmocs_baseline_in.json +++ b/tests/auto/tools/moc/allmocs_baseline_in.json @@ -313,7 +313,7 @@ "read": "flagsList", "scriptable": true, "stored": true, - "type": "QList<Foo::Bar::Flags>", + "type": "QVector<Foo::Bar::Flags>", "user": false, "write": "setFlagsList" } @@ -340,7 +340,7 @@ "access": "public", "arguments": [ { - "type": "QList<QList<int> >" + "type": "QVector<QVector<int> >" } ], "name": "foo", @@ -350,7 +350,7 @@ "access": "public", "arguments": [ { - "type": "QList<QList<int> >" + "type": "QVector<QVector<int> >" } ], "name": "foo2", @@ -360,7 +360,7 @@ "access": "public", "arguments": [ { - "type": "QList< ::AAA::BaseA*>" + "type": "QVector< ::AAA::BaseA*>" } ], "name": "bar", @@ -370,7 +370,7 @@ "access": "public", "arguments": [ { - "type": "QList< ::AAA::BaseA*>" + "type": "QVector< ::AAA::BaseA*>" } ], "name": "bar2", @@ -380,7 +380,7 @@ "access": "public", "arguments": [ { - "type": "QList<const ::AAA::BaseA*>" + "type": "QVector<const ::AAA::BaseA*>" } ], "name": "bar3", |