diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp index 6d209a7751bfcd805af55370ba5edc6245497ae7..6f7da24090dfadc768909b7f21f055fa60346689 100644 --- a/src/core/browser_context_qt.cpp +++ b/src/core/browser_context_qt.cpp @@ -72,7 +72,7 @@ base::FilePath BrowserContextQt::GetPath() const if (dataLocation.isEmpty()) dataLocation = QDir::homePath() % QDir::separator() % QChar::fromLatin1('.') % QCoreApplication::applicationName(); - dataLocation.append(QDir::separator() % QStringLiteral("QtWebEngine")); + dataLocation.append(QDir::separator() % QLatin1String("QtWebEngine")); return base::FilePath(toFilePathString(dataLocation)); } diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 11e068dca9838e1e6fad640506e5ca0cb71e883f..28294dce7da5467e20e5d1b77b68bd1572b39e30 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -235,18 +235,18 @@ public: { QString platform = qApp->platformName().toLower(); QPlatformNativeInterface *pni = QGuiApplication::platformNativeInterface(); - if (platform == QStringLiteral("xcb")) { + if (platform == QLatin1String("xcb")) { if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2) m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext); else m_handle = pni->nativeResourceForContext(QByteArrayLiteral("glxcontext"), qtContext); - } else if (platform == QStringLiteral("cocoa")) + } else if (platform == QLatin1String("cocoa")) m_handle = pni->nativeResourceForContext(QByteArrayLiteral("cglcontextobj"), qtContext); - else if (platform == QStringLiteral("qnx")) + else if (platform == QLatin1String("qnx")) m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext); - else if (platform == QStringLiteral("eglfs")) + else if (platform == QLatin1String("eglfs")) m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext); - else if (platform == QStringLiteral("windows")) { + else if (platform == QLatin1String("windows")) { if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2) m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglContext"), qtContext); else diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index c36a204e97cdbc583a404960d8ed451d019e9ff6..4cdf3813e89c6d105083f4cc35f62353523af1a3 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -78,7 +78,7 @@ QString location(QLibraryInfo::LibraryLocation path) switch (path) { case QLibraryInfo::TranslationsPath: if (!webEnginePath.isEmpty()) - return webEnginePath % QDir::separator() % QStringLiteral("translations"); + return webEnginePath % QDir::separator() % QLatin1String("translations"); break; case QLibraryInfo::DataPath: if (!webEnginePath.isEmpty()) @@ -96,9 +96,9 @@ QString subProcessPath() { static bool initialized = false; #if defined(OS_WIN) - static QString processBinary (QStringLiteral(QTWEBENGINEPROCESS_NAME) % QStringLiteral(".exe")); + static QString processBinary (QLatin1String(QTWEBENGINEPROCESS_NAME) % QLatin1String(".exe")); #else - static QString processBinary (QStringLiteral(QTWEBENGINEPROCESS_NAME)); + static QString processBinary (QLatin1String(QTWEBENGINEPROCESS_NAME)); #endif static QString processPath (location(QLibraryInfo::LibraryExecutablesPath) % QDir::separator() % processBinary); @@ -121,12 +121,12 @@ QString subProcessPath() QString pluginsPath() { - return location(QLibraryInfo::PluginsPath) % QDir::separator() % QStringLiteral("qtwebengine"); + return location(QLibraryInfo::PluginsPath) % QDir::separator() % QLatin1String("qtwebengine"); } QString localesPath() { - return location(QLibraryInfo::TranslationsPath) % QStringLiteral("/qtwebengine_locales"); + return location(QLibraryInfo::TranslationsPath) % QLatin1String("/qtwebengine_locales"); } QString fallbackDir() { @@ -155,7 +155,7 @@ base::FilePath WebEngineLibraryInfo::getPath(int key) QString directory; switch (key) { case QT_RESOURCES_PAK: - return toFilePath(location(QLibraryInfo::DataPath) % QStringLiteral("/qtwebengine_resources.pak")); + return toFilePath(location(QLibraryInfo::DataPath) % QLatin1String("/qtwebengine_resources.pak")); case base::FILE_EXE: case content::CHILD_PROCESS_EXE: return toFilePath(subProcessPath()); diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 8e23f77ae4dd35d73fcff1e72a5687d3e15a3c35..b466c856602d7e590378f53985dda33305b5d173 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -95,7 +95,7 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate() // and instead use a reasonable default value for viewport.devicePixelRatio to avoid every // app having to use this experimental API. QString platform = qApp->platformName().toLower(); - if (platform == QStringLiteral("qnx")) { + if (platform == QLatin1String("qnx")) { qreal webPixelRatio = QGuiApplication::primaryScreen()->physicalDotsPerInch() / 160; // Quantize devicePixelRatio to increments of 1 to allow JS and media queries to select @@ -135,7 +135,7 @@ RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHo RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegateForPopup(RenderWidgetHostViewQtDelegateClient *client) { Q_Q(QQuickWebEngineView); - const bool hasWindowCapability = qApp->platformName().toLower() != QStringLiteral("eglfs"); + const bool hasWindowCapability = qApp->platformName().toLower() != QLatin1String("eglfs"); RenderWidgetHostViewQtDelegateQuick *quickDelegate = new RenderWidgetHostViewQtDelegateQuick(client, /*isPopup = */ true); if (hasWindowCapability) { RenderWidgetHostViewQtDelegateQuickWindow *wrapperWindow = new RenderWidgetHostViewQtDelegateQuickWindow(quickDelegate); diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp index e559c0fbbae6cc9f6929c589a2543dcb4957b828..95e04d69992942ec4507bd6c6937189125d906f5 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -78,7 +78,7 @@ static QString getUIDelegatesImportDir(QQmlEngine *engine) { if (initialized) return importDir; Q_FOREACH (const QString &path, engine->importPathList()) { - QFileInfo fi(path % QStringLiteral("/QtWebEngine/UIDelegates/")); + QFileInfo fi(path % QLatin1String("/QtWebEngine/UIDelegates/")); if (fi.exists()) { importDir = fi.absolutePath(); break; diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp index dd14d751e1a7c774e3463fa5e922173f5137a006..c4a32d685cde97c4b944a065d3c7bf7b445616a0 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -182,7 +182,7 @@ void RenderWidgetHostViewQtDelegateWidget::setTooltip(const QString &tooltip) { QString wrappedTip; if (!tooltip.isEmpty()) - wrappedTip = QStringLiteral("<p>") % tooltip.toHtmlEscaped().left(MaxTooltipLength) % QStringLiteral("</p>"); + wrappedTip = QLatin1String("<p>") % tooltip.toHtmlEscaped().left(MaxTooltipLength) % QLatin1String("</p>"); setToolTip(wrappedTip); }