diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-09 17:34:06 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-02-10 17:00:05 +0000 |
commit | 29daa7645b8d93e4a53e8cd85288740a80f441e9 (patch) | |
tree | 8e69234bb46ba363dbdf118ecb3f064912565511 /src/corelib/kernel/qcoreapplication_p.h | |
parent | 0866680bd904aff4fe2a643a2b81c460cbb99c77 (diff) |
Windows: Reintroduce copy of argv.
Since argc/argv is modified by QCoreApplication-derived classes,
a copy of the original arguments is needed for comparison.
This fixes a crash in Qt Quick 2 tests (which use
the -qmljsdebugger=<port> argument) introduced
by dff18b8e80609da91bf9e9134967dcf0d23eca9e .
Task-number: QTBUG-30330
Change-Id: Ic145ac923e0a7c504ab16602c8686268e4fd9700
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_p.h')
-rw-r--r-- | src/corelib/kernel/qcoreapplication_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index 2b03fe2382..463b115f75 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -116,7 +116,8 @@ public: int &argc; char **argv; #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) - bool modifiedArgv; + int origArgc; + char **origArgv; // store unmodified arguments for QCoreApplication::arguments() #endif void appendApplicationPathToLibraryPaths(void); |