summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_library_info.cpp
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2018-06-15 18:51:21 +0200
committerMichal Klocek <michal.klocek@qt.io>2018-07-02 10:31:10 +0000
commitec127d7e4898940116be9fbbc8dc94b4cfa9b18c (patch)
treeaf9dc33792e1948bdc7362925ab68f74ee9085a8 /src/core/web_engine_library_info.cpp
parent59b8f28d029e45ac3b3e95edda82e6607a880979 (diff)
Migrate from BUILDFLAG to QT_CONFIG
During configuration we mapped qt webengine fetures to chromium ones and passed them to gn. We used BUILDFLAG to optionally compile code in core. Use QT_CONFIG directly for qt files and add config sanity checks to make sure requested features are present. Change-Id: I930df114ac9aec8e73139ea9135925fc3ad8e39c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/core/web_engine_library_info.cpp')
-rw-r--r--src/core/web_engine_library_info.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
index dbf978839..3899ced25 100644
--- a/src/core/web_engine_library_info.cpp
+++ b/src/core/web_engine_library_info.cpp
@@ -208,7 +208,7 @@ QString localesPath()
return potentialLocalesPath;
}
-#if BUILDFLAG(ENABLE_SPELLCHECK)
+#if QT_CONFIG(webengine_spellchecker)
QString dictionariesPath()
{
static QString potentialDictionariesPath;
@@ -254,7 +254,7 @@ QString dictionariesPath()
return potentialDictionariesPath;
}
-#endif // ENABLE_SPELLCHECK
+#endif // QT_CONFIG(webengine_spellchecker)
QString icuDataPath()
{
@@ -343,7 +343,7 @@ base::FilePath WebEngineLibraryInfo::getPath(int key)
return toFilePath(icuDataPath());
case ui::DIR_LOCALES:
return toFilePath(localesPath());
-#if BUILDFLAG(ENABLE_SPELLCHECK)
+#if QT_CONFIG(webengine_spellchecker)
case base::DIR_APP_DICTIONARIES:
return toFilePath(dictionariesPath());
#endif