diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-02 07:03:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-02 07:03:53 +0000 |
| commit | 46798611057285b31c6a134e3f4461ac6aad03c5 (patch) | |
| tree | a441d501f19d57f42b1dec6602acd0cee2bc0139 /src/corelib/kernel/qcoreapplication.cpp | |
| parent | 6cbcff49716e8632fa5d41f68fc11e9ebaf1d3c6 (diff) | |
| parent | b894a8def5d9107663e4968d2d395f5ef3059125 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 0c1c37c89d..7bb2e7a78c 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -419,7 +419,7 @@ QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv, uint if (!isArgvModified(argc, argv)) { origArgc = argc; origArgv = new char *[argc]; - std::copy(argv, argv + argc, origArgv); + std::copy(argv, argv + argc, QT_MAKE_CHECKED_ARRAY_ITERATOR(origArgv, argc)); } #endif // Q_OS_WIN && !Q_OS_WINRT |