diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-21 14:28:27 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-11 10:15:17 +0200 |
| commit | 5f9e2f01e4eae22d9d40bb6b7767cde4cb94766e (patch) | |
| tree | 58ade0563aef01b2fdba98c237d634559a1c1889 /src/tools/qwebengine_convert_dict | |
| parent | 687671d249613bb2b00570f93df35fcaa0eacdd3 (diff) | |
Adaptations for Chromium 77
Fixes: QTBUG-77267
Change-Id: I181e24cf80ebee6991b95dde6c636f0d169b40a4
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/tools/qwebengine_convert_dict')
| -rw-r--r-- | src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro index 912c59092..57f79f582 100644 --- a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro +++ b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro @@ -30,6 +30,9 @@ win32: QMAKE_CXXFLAGS_WARN_ON = -wd4577 # Issue with some template compliation, smb smart should look at it win32: DEFINES += NOMINMAX +# To avoid conflict between windows.h and BoringSSL headers +win32: DEFINES += WIN32_LEAN_AND_MEAN + CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir() INCLUDEPATH += $$CHROMIUM_SRC_DIR \ $$CHROMIUM_SRC_DIR/third_party/boringssl/src/include \ |