diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:36:58 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:36:59 +0200 |
| commit | 1190863fc0855ef25e7239e35da3978f317638bd (patch) | |
| tree | 92c408f7c53f194639d2a10b82f5c90a85704776 /src/corelib/kernel/qcoreapplication.cpp | |
| parent | 02afd94ef4c1913735bd650ca93279cfb00dc534 (diff) | |
| parent | e4484bb15b29b01dba07cbc31c150153f537606a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 386ee9cbda..4a46bb32f5 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -394,7 +394,7 @@ QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv, uint static const char *const empty = ""; if (argc == 0 || argv == 0) { argc = 0; - argv = (char **)∅ // ouch! careful with QCoreApplication::argv()! + argv = (char **)∅ } #ifdef Q_OS_WIN qCopy(argv, argv + argc, origArgv); @@ -589,10 +589,6 @@ void QCoreApplicationPrivate::initLocale() Note that some arguments supplied by the user may have been processed and removed by QCoreApplication. - In cases where command line arguments need to be obtained using the - argv() function, you must convert them from the local string encoding - using QString::fromLocal8Bit(). - \section1 Locale Settings On Unix/Linux Qt is configured to use the system locale settings by |