diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 22:09:30 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 07:18:36 +0200 |
| commit | 9ee4a121938ec74bca61040e481657c25939f425 (patch) | |
| tree | 40d0897c8c79efae556129c3c6c09227f8d353a3 | |
| parent | 5cfb252b07468dbfdd3ee9a4230164d431c1715d (diff) | |
Remove qCopy from QCoreApplication
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I3ae7f8331440241d524844eb387d956c64ab62e9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index bba878d2eb..290248aa6d 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -103,6 +103,8 @@ # include <taskLib.h> #endif +#include <algorithm> + QT_BEGIN_NAMESPACE #ifndef QT_NO_QOBJECT @@ -397,7 +399,7 @@ QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv, uint argv = (char **)∅ } #ifdef Q_OS_WIN - qCopy(argv, argv + argc, origArgv); + std::copy(argv, argv + argc, origArgv); #endif #ifndef QT_NO_QOBJECT |