diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-23 15:02:35 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-03-23 15:02:35 +0100 |
| commit | 5178f6269418d731efe6bec7bc541f21fdd6d7f4 (patch) | |
| tree | cd09fbc67c6e92652e92951cf9c91385ddce8564 /src/quickcontrols2/qquickstyle.cpp | |
| parent | 2b0e33692b949ebaed034c72d0ea3da9f0ef6de2 (diff) | |
| parent | 81f656eeac522532ff98a32aac68a1571ea54c99 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/quickcontrols2/qquickstyle.cpp
tests/auto/controls/data/tst_popup.qml
Change-Id: I7b7bb5f9c63b32eef65c9b2e68f56baa3da69cff
Diffstat (limited to 'src/quickcontrols2/qquickstyle.cpp')
| -rw-r--r-- | src/quickcontrols2/qquickstyle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index 90e2d897..162f3526 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -106,7 +106,7 @@ static QStringList envPathList(const QByteArray &var) QStringList paths; if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty(var))) { const QByteArray value = qgetenv(var); - paths += QString::fromLatin1(value).split(QDir::listSeparator(), QString::SkipEmptyParts); + paths += QString::fromLocal8Bit(value).split(QDir::listSeparator(), QString::SkipEmptyParts); } return paths; } @@ -179,9 +179,9 @@ struct QQuickStyleSpec if (style.isEmpty()) style = QGuiApplicationPrivate::styleOverride; if (style.isEmpty()) - style = QString::fromLatin1(qgetenv("QT_QUICK_CONTROLS_STYLE")); + style = QString::fromLocal8Bit(qgetenv("QT_QUICK_CONTROLS_STYLE")); if (fallbackStyle.isEmpty()) - setFallbackStyle(QString::fromLatin1(qgetenv("QT_QUICK_CONTROLS_FALLBACK_STYLE")), "QT_QUICK_CONTROLS_FALLBACK_STYLE"); + setFallbackStyle(QString::fromLocal8Bit(qgetenv("QT_QUICK_CONTROLS_FALLBACK_STYLE")), "QT_QUICK_CONTROLS_FALLBACK_STYLE"); #if QT_CONFIG(settings) if (style.isEmpty() || fallbackStyle.isEmpty()) { QSharedPointer<QSettings> settings = QQuickStylePrivate::settings(QStringLiteral("Controls")); |