diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-31 15:06:38 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-06 13:29:01 +0200 |
| commit | 221336446103cc684b52a360eebf32eff266a3e2 (patch) | |
| tree | 1be3779d18b481bd3a4ad112dbad0a8de6abafa5 /tools | |
| parent | 494b964c642f9f582772dca1cb717d06f1d2adb7 (diff) | |
Update dependencies
Port to new QMetaType registration scheme. A number of
test needs to be skipped.
Change-Id: I6fb47c4bf2d2ded7fff0e95dd28d65f8e813c8c1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/repc/moc_copy/moc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/repc/moc_copy/moc.cpp b/tools/repc/moc_copy/moc.cpp index 68c01f3..c1db8ec 100644 --- a/tools/repc/moc_copy/moc.cpp +++ b/tools/repc/moc_copy/moc.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE // only moc needs this function -static QByteArray normalizeType(const QByteArray &ba, bool fixScope = false) +static QByteArray normalizeType(const QByteArray &ba) { const char *s = ba.constData(); int len = ba.size(); @@ -62,7 +62,7 @@ static QByteArray normalizeType(const QByteArray &ba, bool fixScope = false) } } *d = '\0'; - QByteArray result = normalizeTypeInternal(buf, d, fixScope); + QByteArray result = normalizeTypeInternal(buf, d); if (buf != stackbuf) delete [] buf; return result; |