diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-23 13:48:07 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-23 13:48:29 +0200 |
| commit | 51763b1b191c0839ea05c75855b9e09b65b80546 (patch) | |
| tree | 113c4b4328ddecd07c8cff2ac19cea6f2aec0ba2 /tools/qmlplugindump | |
| parent | 2b7b24a0e039a18db8ab23475fbab44718f758a2 (diff) | |
| parent | 363189a3d351ace484180ede0f2f6c4ed04f8401 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
Change-Id: I31375151eb239f348bec988d2d0506c2b4d9604c
Diffstat (limited to 'tools/qmlplugindump')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 2b919909ac..79f9b2c49b 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -999,7 +999,7 @@ int main(int argc, char *argv[]) // Check which kind of application should be instantiated. bool useQApplication = false; for (int i = 0; i < argc; ++i) { - QString arg = QLatin1String(argv[1]); + QString arg = QLatin1String(argv[i]); if (arg == QLatin1String("--qapp") || arg == QLatin1String("-qapp")) useQApplication = true; } |