pyrox.dev
lol
qt58.qtbase: use QLatin1String instead of QStringLiteral
+5
-5
+1
-1
pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
+1
-1
pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
···
12
12
- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
13
13
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
14
14
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
15
-
+ m_possibleLocations.append(QStringLiteral(NIXPKGS_QTCOMPOSE));
15
+
+ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE));
16
16
}
17
17
18
18
QString TableGenerator::findComposeFile()
+2
-2
pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
+2
-2
pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
···
19
19
+
20
20
+#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS
21
21
+ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':');
22
-
+ XDG_DATA_DIRS << QStringLiteral(NIXPKGS_QGTK3_XDG_DATA_DIRS);
22
+
+ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS);
23
23
+ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':')));
24
24
+#endif
25
25
+
26
26
+#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES
27
27
+ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':');
28
-
+ GIO_EXTRA_MODULES << QStringLiteral(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);
28
+
+ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);
29
29
+ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':')));
30
30
+#endif
31
31
+
+2
-2
pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
+2
-2
pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
···
9
9
- if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
10
10
- return ret;
11
11
}
12
-
+ QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
12
+
+ QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
13
13
+ if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
14
14
+ return ret;
15
15
#else
···
29
29
- (*it).append(postFix);
30
30
- }
31
31
+ }
32
-
+ QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
32
+
+ QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
33
33
+ list = directLoader()->keyMap().values();
34
34
+ if (!list.isEmpty()) {
35
35
+ const QString postFix = QLatin1String(" (from ")