diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-03 15:49:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-03 15:49:15 +0200 |
| commit | 6357813207c866c99aadfd91af8fb3affe891f1d (patch) | |
| tree | 69464d415b12ebaa3e57d88d7b5cd113878be988 /src/gui/kernel | |
| parent | 5a76a3fb03f8d1dc8cb367de1a1dc6a37048376a (diff) | |
| parent | b3fcaea5f2b97d3f562add97aee48cbb469c875a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
src/3rdparty/double-conversion/include/double-conversion/utils.h
src/corelib/global/qnamespace.qdoc
src/corelib/tools/qsimd_p.h
tests/auto/corelib/io/qfile/tst_qfile.cpp
Change-Id: I3ca1007bab5355d251c13002a18e93d81c254d34
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 1f102dcec5..239c5e135b 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1366,9 +1366,9 @@ void QGuiApplicationPrivate::init() } else if (strcmp(arg, "-testability") == 0) { loadTestability = true; } else if (strncmp(arg, "-style=", 7) == 0) { - s = QString::fromLocal8Bit(arg + 7).toLower(); + s = QString::fromLocal8Bit(arg + 7); } else if (strcmp(arg, "-style") == 0 && i < argc - 1) { - s = QString::fromLocal8Bit(argv[++i]).toLower(); + s = QString::fromLocal8Bit(argv[++i]); } else { argv[j++] = argv[i]; } |