summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreapplication_p.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-05-16 09:39:39 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-16 19:35:51 +0200
commit420b62f2028d2331a729ef800b40dfc762d1613c (patch)
treed8c0a0dd310c2234523b59174fc1ed8e8028a05d /src/corelib/kernel/qcoreapplication_p.h
parent83f796d2739fc927d671925541dec654d3492b94 (diff)
QCoreApplication: No longer hardcode arguments to be filtered out.
On Windows, Unicode command line arguments are re-created from the original command line filtering out the known arguments. To avoid having to hard-code all arguments of derived application classes, keep the original argv-array and use that to verify if an argument is still present. Task-number: QTBUG-25724 Change-Id: I5d7bbd9530b1b74e1dcd22a0edc4f323ef687d23 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_p.h')
-rw-r--r--src/corelib/kernel/qcoreapplication_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index 15aca398b7..33021d443f 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -109,6 +109,10 @@ public:
#endif
int &argc;
char **argv;
+#ifdef Q_OS_WIN
+ int origArgc;
+ char **origArgv; // store unmodified arguments for QCoreApplication::arguments()
+#endif
void appendApplicationPathToLibraryPaths(void);
void cleanupThreadData();