diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:35:03 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:35:03 +0100 |
| commit | d9ea4917ca97aeee050a86151fbfa069771b498d (patch) | |
| tree | 21fd6960d8a866bf6f5a5a8f9db9be801f8065c1 /tools/qmlimportscanner/main.cpp | |
| parent | f9beafddd256cd0b79bf2478a812053ef61241fc (diff) | |
| parent | c6a26c248e8abc421b87c3dd6b2466d490ea902e (diff) | |
Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly
Change-Id: I729af792166fd2f6c5843ba564e63adf8ae09a97
Diffstat (limited to 'tools/qmlimportscanner/main.cpp')
| -rw-r--r-- | tools/qmlimportscanner/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp index d596613553..5bd66243e6 100644 --- a/tools/qmlimportscanner/main.cpp +++ b/tools/qmlimportscanner/main.cpp @@ -509,7 +509,7 @@ int main(int argc, char *argv[]) while (i < args.count()) { const QString &arg = args.at(i); ++i; - QStringList *argReceiver = 0; + QStringList *argReceiver = nullptr; if (!arg.startsWith(QLatin1Char('-')) || arg == QLatin1String("-")) { qmlRootPaths += arg; } else if (arg == QLatin1String("-rootPath")) { |