diff options
| author | Aurélien Gâteau <agateau@kde.org> | 2012-10-11 09:15:03 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-18 08:35:35 (GMT) |
| commit | 9fbefb4503235b634f91b16018a6fe1a104a3f0d (patch) | |
| tree | 74baa0b8f690b097153bb2a19d86684ea5428948 | |
| parent | ac371e98f33da6a80acb08da72ebc0720b70385b (diff) | |
| download | Qt-9fbefb4503235b634f91b16018a6fe1a104a3f0d.zip Qt-9fbefb4503235b634f91b16018a6fe1a104a3f0d.tar.gz Qt-9fbefb4503235b634f91b16018a6fe1a104a3f0d.tar.bz2 | |
Allow qmljsdebugger argument and value to be separated by a space
This change makes it possible to use the QML JS debugger with KDE
applications.
Change-Id: I1c6615c604a4023062fe6e6ead66dfcea9f8d493
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qtbase/fea68274b89a9bcde55eabbf6eb7bf2e8376d930)
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index bb07d74..483c9fe 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -236,6 +236,9 @@ void QCoreApplicationPrivate::processCommandLineArguments() QByteArray arg = argv[i]; if (arg.startsWith("-qmljsdebugger=")) { *qmljs_debug_arguments() = QString::fromLocal8Bit(arg.right(arg.length() - 15)); + } else if (arg == "-qmljsdebugger" && i < argc - 1) { + ++i; + *qmljs_debug_arguments() = QString::fromLocal8Bit(argv[i]); } else { argv[j++] = argv[i]; } @@ -2319,6 +2322,7 @@ QStringList QCoreApplication::arguments() l1arg.startsWith("-qmljsdebugger=")) ; else if (l1arg == "-style" || + l1arg == "-qmljsdebugger" || l1arg == "-session" || l1arg == "-graphicssystem" || l1arg == "-testability") |