diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-16 18:34:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-08-04 11:20:50 +0200 |
| commit | fae023b184f6c044e85f4ca6052c306d519e2e85 (patch) | |
| tree | 0c470f156e41fbe5d47782f34a3a8afc17ee3147 /src/core/tools/main.cpp | |
| parent | 38a6d268b09c49878b3a9b4819771f5c74925c35 (diff) | |
| download | qtwebengine-fae023b184f6c044e85f4ca6052c306d519e2e85.tar.gz | |
Adaptations for Chromium 100
Pick-to: 6.4
Change-Id: I217c87657f544a2e868de7291353ff1143e20902
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/tools/main.cpp')
| -rw-r--r-- | src/core/tools/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/tools/main.cpp b/src/core/tools/main.cpp index 725ac9134..4b6c82997 100644 --- a/src/core/tools/main.cpp +++ b/src/core/tools/main.cpp @@ -128,7 +128,7 @@ inline bool VerifyWords(const convert_dict::DicReader::WordList& org_words, return true; } -#if defined(OS_MAC) && defined(QT_MAC_FRAMEWORK_BUILD) +#if defined(Q_OS_DARWIN) && defined(QT_MAC_FRAMEWORK_BUILD) QString frameworkIcuDataPath() { return QLibraryInfo::location(QLibraryInfo::LibrariesPath) + @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) icuDataDir = icuPossibleEnvDataDir; icuDataDirFound = true; } -#if defined(OS_MAC) && defined(QT_MAC_FRAMEWORK_BUILD) +#if defined(Q_OS_DARWIN) && defined(QT_MAC_FRAMEWORK_BUILD) // In a macOS Qt framework build, the resources are inside the QtWebEngineCore framework // Resources directory, rather than in the Qt install location. else if (QFileInfo::exists(frameworkIcuDataPath())) { |