diff options
Diffstat (limited to 'Source/WebCore/PlatformQt.cmake')
-rw-r--r-- | Source/WebCore/PlatformQt.cmake | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/Source/WebCore/PlatformQt.cmake b/Source/WebCore/PlatformQt.cmake index c5466b6c7..f0e68cf9e 100644 --- a/Source/WebCore/PlatformQt.cmake +++ b/Source/WebCore/PlatformQt.cmake @@ -110,6 +110,7 @@ list(APPEND WebCore_SOURCES platform/network/NetworkStorageSessionStub.cpp platform/network/MIMESniffing.cpp + platform/network/qt/BlobUrlConversion.cpp platform/network/qt/CookieJarQt.cpp platform/network/qt/CredentialStorageQt.cpp platform/network/qt/DNSQt.cpp @@ -162,19 +163,19 @@ list(APPEND WebCore_SOURCES platform/text/qt/TextBreakIteratorInternalICUQt.cpp ) -QTWEBKIT_GENERATE_MOC_FILES_CPP( +QTWEBKIT_GENERATE_MOC_FILES_CPP(WebCore platform/network/qt/DNSQt.cpp platform/qt/MainThreadSharedTimerQt.cpp ) -QTWEBKIT_GENERATE_MOC_FILES_H( +QTWEBKIT_GENERATE_MOC_FILES_H(WebCore platform/network/qt/CookieJarQt.h platform/network/qt/QNetworkReplyHandler.h platform/network/qt/QtMIMETypeSniffer.h ) -QTWEBKIT_GENERATE_MOC_FILE_H(platform/network/qt/NetworkStateNotifierPrivate.h platform/network/qt/NetworkStateNotifierQt.cpp) -QTWEBKIT_GENERATE_MOC_FILE_H(platform/network/qt/SocketStreamHandlePrivate.h platform/network/qt/SocketStreamHandleQt.cpp) +QTWEBKIT_GENERATE_MOC_FILE_H(WebCore platform/network/qt/NetworkStateNotifierPrivate.h platform/network/qt/NetworkStateNotifierQt.cpp) +QTWEBKIT_GENERATE_MOC_FILE_H(WebCore platform/network/qt/SocketStreamHandlePrivate.h platform/network/qt/SocketStreamHandleQt.cpp) if (COMPILER_IS_GCC_OR_CLANG) set_source_files_properties( @@ -182,6 +183,12 @@ if (COMPILER_IS_GCC_OR_CLANG) PROPERTIES COMPILE_FLAGS "-frtti -UQT_NO_DYNAMIC_CAST" ) + + set_source_files_properties( + platform/network/qt/BlobUrlConversion.cpp + PROPERTIES + COMPILE_FLAGS "-fexceptions -UQT_NO_EXCEPTIONS" + ) endif () if (ENABLE_DEVICE_ORIENTATION) @@ -197,7 +204,7 @@ if (ENABLE_GAMEPAD_DEPRECATED) list(APPEND WebCore_SOURCES platform/qt/GamepadsQt.cpp ) - QTWEBKIT_GENERATE_MOC_FILES_CPP(platform/qt/GamepadsQt.cpp) + QTWEBKIT_GENERATE_MOC_FILES_CPP(WebCore platform/qt/GamepadsQt.cpp) endif () if (ENABLE_GRAPHICS_CONTEXT_3D) @@ -221,7 +228,7 @@ if (ENABLE_NETSCAPE_PLUGIN_API) platform/win/WebCoreInstanceHandle.cpp ) list(APPEND WebCore_LIBRARIES - Shlwapi + shlwapi version ) elseif (PLUGIN_BACKEND_XLIB) @@ -374,7 +381,7 @@ if (USE_QT_MULTIMEDIA) list(APPEND WebCore_LIBRARIES ${Qt5Multimedia_LIBRARIES} ) - QTWEBKIT_GENERATE_MOC_FILES_H(platform/graphics/qt/MediaPlayerPrivateQt.h) + QTWEBKIT_GENERATE_MOC_FILES_H(WebCore platform/graphics/qt/MediaPlayerPrivateQt.h) endif () if (ENABLE_VIDEO) |