diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-27 11:28:30 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:42:10 +0100 |
| commit | 13ac394567cb287c5caceef15f531544d73fde09 (patch) | |
| tree | 38a497e108b6de6c98e9621e75def96dd8b6a55e /src/core/web_engine_library_info.cpp | |
| parent | f51f50c22e770e1ab20ecccc8a32906e4014caed (diff) | |
Update dependencies on 'dev' in qt/qtwebengine
Change-Id: I74c7293ebf5ace5bd07e3bf5455dd90bf4ed6380
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/web_engine_library_info.cpp')
| -rw-r--r-- | src/core/web_engine_library_info.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index fa9e34268..aa3dd7bdc 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -166,7 +166,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() @@ -203,7 +203,7 @@ QString localesPath() #if defined(OS_MACOSX) && 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) { @@ -252,7 +252,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; } @@ -276,13 +276,13 @@ QString resourcesDataPath() #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD) getResourcesPath(frameworkBundle()); #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)); |