From f392614251e9162fbf75f601c1e3bb8dd948029c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 11:06:31 -0500 Subject: [PATCH] qt58.qtbase: use QLatin1String instead of QStringLiteral --- .../libraries/qt-5/5.8/qtbase/compose-search-path.patch | 2 +- pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch | 4 ++-- .../libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch index d0bea4afaa3..225d47f8e22 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch @@ -12,7 +12,7 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/gen - m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); -+ m_possibleLocations.append(QStringLiteral(NIXPKGS_QTCOMPOSE)); ++ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE)); } QString TableGenerator::findComposeFile() diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch index 6a22b203afc..8e5e2c71828 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch @@ -19,13 +19,13 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platformthemes/gtk3/main.cpp + +#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS + QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); -+ XDG_DATA_DIRS << QStringLiteral(NIXPKGS_QGTK3_XDG_DATA_DIRS); ++ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); + qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); +#endif + +#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES + QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); -+ GIO_EXTRA_MODULES << QStringLiteral(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); ++ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); + qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); +#endif + diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch index 270116e1978..18780db05e7 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch @@ -9,7 +9,7 @@ Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cp - if (QPlatformIntegration *ret = qLoadPlugin(directLoader(), platform, paramList, argc, argv)) - return ret; } -+ QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); ++ QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); + if (QPlatformIntegration *ret = qLoadPlugin(directLoader(), platform, paramList, argc, argv)) + return ret; #else @@ -29,7 +29,7 @@ Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cp - (*it).append(postFix); - } + } -+ QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); ++ QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); + list = directLoader()->keyMap().values(); + if (!list.isEmpty()) { + const QString postFix = QLatin1String(" (from ")