Disable automatic conversions from 8-bit strings
This commit is contained in:
@@ -115,28 +115,28 @@ void GstStartup::SetEnvironment() {
|
||||
// Set plugin root path
|
||||
QString plugin_root_path;
|
||||
# if defined(Q_OS_MACOS)
|
||||
plugin_root_path = QDir::cleanPath(app_path + "/../PlugIns");
|
||||
plugin_root_path = QDir::cleanPath(app_path + QStringLiteral("/../PlugIns"));
|
||||
# elif defined(Q_OS_UNIX)
|
||||
plugin_root_path = QDir::cleanPath(app_path + "/../plugins");
|
||||
plugin_root_path = QDir::cleanPath(app_path + QStringLiteral("/../plugins"));
|
||||
# elif defined(Q_OS_WIN32)
|
||||
plugin_root_path = app_path;
|
||||
# endif
|
||||
|
||||
// Set GIO module path
|
||||
const QString gio_module_path = plugin_root_path + "/gio-modules";
|
||||
const QString gio_module_path = plugin_root_path + QStringLiteral("/gio-modules");
|
||||
|
||||
// Set GStreamer plugin scanner path
|
||||
QString gst_plugin_scanner;
|
||||
# if defined(Q_OS_UNIX)
|
||||
gst_plugin_scanner = plugin_root_path + "/gst-plugin-scanner";
|
||||
gst_plugin_scanner = plugin_root_path + QStringLiteral("/gst-plugin-scanner");
|
||||
# endif
|
||||
|
||||
// Set GStreamer plugin path
|
||||
QString gst_plugin_path;
|
||||
# if defined(Q_OS_WIN32)
|
||||
gst_plugin_path = plugin_root_path + "/gstreamer-plugins";
|
||||
gst_plugin_path = plugin_root_path + QStringLiteral("/gstreamer-plugins");
|
||||
# else
|
||||
gst_plugin_path = plugin_root_path + "/gstreamer";
|
||||
gst_plugin_path = plugin_root_path + QStringLiteral("/gstreamer");
|
||||
# endif
|
||||
|
||||
if (!gio_module_path.isEmpty()) {
|
||||
@@ -175,7 +175,7 @@ void GstStartup::SetEnvironment() {
|
||||
|
||||
|
||||
#if defined(Q_OS_WIN32) || defined(Q_OS_MACOS)
|
||||
QString gst_registry_filename = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + QString("/gst-registry-%1-bin").arg(QCoreApplication::applicationVersion());
|
||||
QString gst_registry_filename = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + QStringLiteral("/gst-registry-%1-bin").arg(QCoreApplication::applicationVersion());
|
||||
qLog(Debug) << "Setting GStreamer registry file to" << gst_registry_filename;
|
||||
Utilities::SetEnv("GST_REGISTRY", gst_registry_filename);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user