diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-10 13:08:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 09:25:42 +0200 |
| commit | 5909e6d0d10de3e1370b3ea0bc596f580101e3b4 (patch) | |
| tree | 6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Source/WebCore/PlatformQt.cmake | |
| parent | beaeeb99881184fd368c121fcbb1a31c78b794a3 (diff) | |
| parent | 81cbb264cb9446c4408124d50aeff50164ad0ab4 (diff) | |
| download | qtwebkit-5909e6d0d10de3e1370b3ea0bc596f580101e3b4.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.212' into dev"
Diffstat (limited to 'Source/WebCore/PlatformQt.cmake')
| -rw-r--r-- | Source/WebCore/PlatformQt.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/WebCore/PlatformQt.cmake b/Source/WebCore/PlatformQt.cmake index 49c76a8de..99c625dc3 100644 --- a/Source/WebCore/PlatformQt.cmake +++ b/Source/WebCore/PlatformQt.cmake @@ -2,6 +2,12 @@ include(platform/ImageDecoders.cmake) include(platform/Linux.cmake) include(platform/TextureMapper.cmake) +if (NOT USE_LIBJPEG) + list(REMOVE_ITEM WebCore_SOURCES + platform/image-decoders/jpeg/JPEGImageDecoder.cpp + ) +endif () + if (JPEG_DEFINITIONS) add_definitions(${JPEG_DEFINITIONS}) endif () @@ -277,6 +283,7 @@ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES ${Qt5Gui_INCLUDE_DIRS} ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} + ${Qt5Network_PRIVATE_INCLUDE_DIRS} ${Qt5Sensors_INCLUDE_DIRS} ${SQLITE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} @@ -446,6 +453,11 @@ endif () # From PlatformWin.cmake if (WIN32) + # Eliminate C2139 errors + if (MSVC) + add_compile_options(/D_ENABLE_EXTENDED_ALIGNED_STORAGE) + endif () + if (${JavaScriptCore_LIBRARY_TYPE} MATCHES STATIC) add_definitions(-DSTATICALLY_LINKED_WITH_WTF -DSTATICALLY_LINKED_WITH_JavaScriptCore) endif () |