diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-01-09 14:52:02 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-05 05:20:20 +0000 |
| commit | dff18b8e80609da91bf9e9134967dcf0d23eca9e (patch) | |
| tree | 222a4d4d373f178d616a960bffbc2837047831dc /src/corelib/kernel/qcoreapplication_p.h | |
| parent | 57469a8e10f11ee04964ed9f8f8d00de0d6d45c1 (diff) | |
Windows: Allow for passing a modified argv to QCoreApplication.
Check by comparing __argc/__argv whether a modified argv was
passed to QCoreApplication. If that is the case, build
QCoreApplication::arguments() from that argv instead of using
the command line.
[ChangeLog][Important Behavior Changes][QCoreApplication]
On Windows, QCoreApplication::arguments() now returns a list built
from argv on Windows as well if a modified argv was passed to the
class' constructor.
Task-number: QTBUG-30330
Task-number: QTSOLBUG-184
Change-Id: I2498bb554130e7bfaeada3aebe786dfdd0eb534d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_p.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index a3a0eaa68c..2b03fe2382 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -115,9 +115,8 @@ public: int &argc; char **argv; -#ifdef Q_OS_WIN - int origArgc; - char **origArgv; // store unmodified arguments for QCoreApplication::arguments() +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) + bool modifiedArgv; #endif void appendApplicationPathToLibraryPaths(void); |