From 29daa7645b8d93e4a53e8cd85288740a80f441e9 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Mon, 9 Feb 2015 17:34:06 +0100
Subject: 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>
---
 src/corelib/kernel/qcoreapplication_p.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/corelib/kernel/qcoreapplication_p.h')

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);
 
-- 
cgit v1.2.3