diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-05-27 09:58:12 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-06-20 20:01:33 +0200 |
commit | 03326a2fec416405b437089874f6439e937bbada (patch) | |
tree | 48d7137c3cd5e6f537e06e97380d3c1e76a56af9 /tests/auto/tools/moc/allmocs_baseline_in.json | |
parent | 1a9a4af388477efd9f7008d5c0bb74432c20279d (diff) |
Move implementation of QVector/List back to qlist.h
And name the main class QList. That's also the one we document.
This gives less porting pain for our users, and a lot less churn
in our API, as we use QList in Qt 5 in 95% of our API.
In addition, it gives more consistent naming with QStringList and
QByteArrayList and disambiguates QList vs QVector(2|3|4)D.
Fixes: QTBUG-84468
Change-Id: I3cba9d1d3179969d8bf9320b31be2230d021d1a9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/tools/moc/allmocs_baseline_in.json')
-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 7b025963e2..85751845c4 100644 --- a/tests/auto/tools/moc/allmocs_baseline_in.json +++ b/tests/auto/tools/moc/allmocs_baseline_in.json @@ -1251,7 +1251,7 @@ "required": false, "scriptable": true, "stored": true, - "type": "QVector<Foo::Bar::Flags>", + "type": "QList<Foo::Bar::Flags>", "user": false, "write": "setFlagsList" } @@ -2699,7 +2699,7 @@ "access": "public", "arguments": [ { - "type": "QVector<QVector<int>>" + "type": "QList<QList<int>>" } ], "name": "foo", @@ -2709,7 +2709,7 @@ "access": "public", "arguments": [ { - "type": "QVector<QVector<int>>" + "type": "QList<QList<int>>" } ], "name": "foo2", @@ -2719,7 +2719,7 @@ "access": "public", "arguments": [ { - "type": "QVector<::AAA::BaseA*>" + "type": "QList<::AAA::BaseA*>" } ], "name": "bar", @@ -2729,7 +2729,7 @@ "access": "public", "arguments": [ { - "type": "QVector<::AAA::BaseA*>" + "type": "QList<::AAA::BaseA*>" } ], "name": "bar2", @@ -2739,7 +2739,7 @@ "access": "public", "arguments": [ { - "type": "QVector<const ::AAA::BaseA*>" + "type": "QList<const ::AAA::BaseA*>" } ], "name": "bar3", |