diff options
Diffstat (limited to 'src/core/web_engine_library_info.cpp')
| -rw-r--r-- | src/core/web_engine_library_info.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index 09a4141b0..47c4634b3 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -168,7 +168,7 @@ QString subProcessPath() candidatePaths << getPath(frameworkBundle()) % QStringLiteral("/Helpers/" QTWEBENGINEPROCESS_NAME ".app/Contents/MacOS/" QTWEBENGINEPROCESS_NAME); #else - candidatePaths << QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath) + candidatePaths << QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath) % QLatin1Char('/') % processBinary; #endif candidatePaths << QCoreApplication::applicationDirPath() @@ -205,7 +205,7 @@ QString localesPath() #if defined(OS_MAC) && defined(QT_MAC_FRAMEWORK_BUILD) getResourcesPath(frameworkBundle()) % QLatin1String("/qtwebengine_locales"); #else - QLibraryInfo::location(QLibraryInfo::TranslationsPath) % QDir::separator() % QLatin1String("qtwebengine_locales"); + QLibraryInfo::path(QLibraryInfo::TranslationsPath) % QDir::separator() % QLatin1String("qtwebengine_locales"); #endif if (!initialized) { @@ -254,7 +254,7 @@ QString dictionariesPath() candidatePaths << frameworkDictionariesPath; #endif - QString libraryDictionariesPath = QLibraryInfo::location(QLibraryInfo::DataPath) + QString libraryDictionariesPath = QLibraryInfo::path(QLibraryInfo::DataPath) % QDir::separator() % QLatin1String("qtwebengine_dictionaries"); candidatePaths << libraryDictionariesPath; } @@ -280,13 +280,13 @@ QString resourcesDataPath() #elif defined(OS_MAC) QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/Resources"); #else - QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources"); + QLibraryInfo::path(QLibraryInfo::DataPath) % QLatin1String("/resources"); #endif if (!initialized) { initialized = true; if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) { qWarning("Qt WebEngine resources not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath)); - potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath); + potentialResourcesPath = QLibraryInfo::path(QLibraryInfo::DataPath); } if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) { qWarning("Qt WebEngine resources not found at %s. Trying application directory...", qPrintable(potentialResourcesPath)); @@ -377,8 +377,8 @@ bool WebEngineLibraryInfo::isUNCPath(const QString &path) { return (base::FilePath::IsSeparator(path.at(0).toLatin1()) && base::FilePath::IsSeparator(path.at(1).toLatin1()) - && path.at(2) != "." && path.at(2) != "?" - && path.at(2).isLetter() && path.at(3) != ":"); + && path.at(2) != QLatin1Char('.') && path.at(2) != QLatin1Char('?') + && path.at(2).isLetter() && path.at(3) != QLatin1Char(':')); } #endif |