diff --git a/win-linux/src/cthemes.h b/win-linux/src/cthemes.h index c514e0271..5a3828481 100644 --- a/win-linux/src/cthemes.h +++ b/win-linux/src/cthemes.h @@ -86,7 +86,7 @@ public: auto isSystem() const -> bool; private: - CTheme(const QString& id = QString()); + CTheme(const QString& path = QString()); ~CTheme(); class CThemePrivate; diff --git a/win-linux/src/windows/cmainwindow.cpp b/win-linux/src/windows/cmainwindow.cpp index ce42dc5e2..bb4e91c39 100644 --- a/win-linux/src/windows/cmainwindow.cpp +++ b/win-linux/src/windows/cmainwindow.cpp @@ -922,7 +922,7 @@ void CMainWindow::onPortalUITheme(int viewid, const std::wstring& json) else m_pTabs->setTabTheme(index, "light", "#fff"); } else { QJsonParseError jerror; - QJsonDocument jdoc = QJsonDocument::fromJson(QString::fromStdWString(json).toLatin1(), &jerror); + QJsonDocument jdoc = QJsonDocument::fromJson(QString::fromStdWString(json).toUtf8(), &jerror); if( jerror.error == QJsonParseError::NoError ) { QJsonObject objRoot = jdoc.object();