diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-03-30 15:27:58 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-03-31 10:31:00 +0000 |
| commit | be770ca621f6463339b7d15be088e1b9acd851e5 (patch) | |
| tree | 1a843019f693c100adea3f3acd47999f3eba2796 /Tools | |
| parent | eaaf1391d58f17bde794d6c8634e092209898941 (diff) | |
Import WebKit commit 13ac532967b6ac2d18d6fc4ea72c4ca35eccff20
Change-Id: I12a5c8f98aeaac1b542ce20c0ff297c57b5d84d1
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/projects/qtjpeg/qtjpeg.pro | 3 | ||||
| -rw-r--r-- | Tools/qmake/projects/qtpng/qtpng.pro | 3 | ||||
| -rw-r--r-- | Tools/qt/manifest.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Tools/qmake/projects/qtjpeg/qtjpeg.pro b/Tools/qmake/projects/qtjpeg/qtjpeg.pro index a0c817a47..33aa665d3 100644 --- a/Tools/qmake/projects/qtjpeg/qtjpeg.pro +++ b/Tools/qmake/projects/qtjpeg/qtjpeg.pro @@ -5,8 +5,7 @@ TARGET = qtjpeg CONFIG += \ static \ hide_symbols \ - exceptions_off rtti_off warn_off \ - installed + exceptions_off rtti_off warn_off load(qt_helper_lib) diff --git a/Tools/qmake/projects/qtpng/qtpng.pro b/Tools/qmake/projects/qtpng/qtpng.pro index b6512f012..349034c56 100644 --- a/Tools/qmake/projects/qtpng/qtpng.pro +++ b/Tools/qmake/projects/qtpng/qtpng.pro @@ -9,8 +9,7 @@ TARGET = qtpng CONFIG += \ static \ hide_symbols \ - exceptions_off rtti_off warn_off \ - installed + exceptions_off rtti_off warn_off load(qt_helper_lib) diff --git a/Tools/qt/manifest.txt b/Tools/qt/manifest.txt index 5d06c4530..8ae73e35f 100644 --- a/Tools/qt/manifest.txt +++ b/Tools/qt/manifest.txt @@ -69,7 +69,8 @@ exclude Source/WebKit2/Resources file Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js # Windows-specific code -file Source/WTF/wtf/win/GDIObject.h +file Source/WTF/wtf/threads/win/BinarySemaphoreWin.cpp +file Source/WTF/wtf/win file Source/WebCore/platform/graphics/win/LocalWindowsContext.h file Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp file Source/WebCore/platform/graphics/win/TransformationMatrixWin.cpp @@ -82,6 +83,7 @@ file Source/WebCore/platform/win/WebCoreInstanceHandle.h # macOS-specific code file Source/WTF/wtf/cf +file Source/WTF/wtf/cocoa file Source/WTF/wtf/text/cf file Source/WebCore/platform/cf/SharedBufferCF.cpp |