diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-21 06:12:49 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-22 08:43:17 +0000 |
| commit | bd3f57b00bee3088971209a0ebc513eb1ef4ba14 (patch) | |
| tree | 651d181d7348d440ff164909e8480297e4e7f18e /Tools | |
| parent | 3b7091813e38631b9ca03ce9657c170ee8826439 (diff) | |
Import WebKit commit 584c4a7a6a8bffb60f03b9eb10a65dbcf41dc0b7
Change-Id: Ife943bbbd8226afa05ef6320b10ba351d55fd797
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/PlatformQt.cmake | 2 | ||||
| -rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 13 | ||||
| -rw-r--r-- | Tools/qt/manifest.txt | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/Tools/PlatformQt.cmake b/Tools/PlatformQt.cmake index 5b1783887..311156446 100644 --- a/Tools/PlatformQt.cmake +++ b/Tools/PlatformQt.cmake @@ -1,3 +1,5 @@ +remove_definitions(-DQT_ASCII_CAST_WARNINGS) + add_subdirectory(QtTestBrowser) if (ENABLE_API_TESTS) diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index 45d97e976..4b47f54f4 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -73,6 +73,11 @@ build_pass|!debug_and_release { } exists($$QMAKE_MAC_SDK_PATH): CMAKE_CONFIG += CMAKE_OSX_SYSROOT=$$QMAKE_MAC_SDK_PATH !isEmpty(QMAKE_MACOSX_DEPLOYMENT_TARGET): CMAKE_CONFIG += CMAKE_OSX_DEPLOYMENT_TARGET=$$QMAKE_MACOSX_DEPLOYMENT_TARGET + + # Hack: install frameworks in debug_and_release in separate prefixes + debug_and_release:build_all:CONFIG(debug, debug|release) { + CMAKE_CONFIG += CMAKE_INSTALL_PREFIX=\"$$[QT_INSTALL_PREFIX]/debug\" + } } equals(QMAKE_HOST.os, Windows) { @@ -112,17 +117,13 @@ build_pass|!debug_and_release { QMAKE_EXTRA_TARGETS += default_target # When debug and release are built at the same time, don't install data files twice - debug_and_release:build_all:CONFIG(debug, debug|release) { - cmake_install_args = "-DCOMPONENT=Code" - # TODO: Fix macOS frameworks installation in debug_and_release - macos: destdir_suffix = "/debug" - } + debug_and_release:build_all:CONFIG(debug, debug|release): cmake_install_args = "-DCOMPONENT=Code" install_impl_target.target = install_impl install_impl_target.commands = cd $$cmake_build_dir && cmake $$cmake_install_args -P cmake_install.cmake QMAKE_EXTRA_TARGETS += install_impl_target install_target.target = install - install_target.commands = $(MAKE) -f $(MAKEFILE) install_impl $$make_args DESTDIR=$(INSTALL_ROOT)$$destdir_suffix + install_target.commands = $(MAKE) -f $(MAKEFILE) install_impl $$make_args DESTDIR=$(INSTALL_ROOT) QMAKE_EXTRA_TARGETS += install_target } diff --git a/Tools/qt/manifest.txt b/Tools/qt/manifest.txt index 8ae73e35f..8affd54a2 100644 --- a/Tools/qt/manifest.txt +++ b/Tools/qt/manifest.txt @@ -73,13 +73,9 @@ 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/MediaPlayerPrivateMediaFoundation.h file Source/WebCore/platform/graphics/win/TransformationMatrixWin.cpp -file Source/WebCore/platform/win/BitmapInfo.cpp -file Source/WebCore/platform/win/BitmapInfo.h -file Source/WebCore/platform/win/SystemInfo.cpp -file Source/WebCore/platform/win/SystemInfo.h -file Source/WebCore/platform/win/WebCoreInstanceHandle.cpp -file Source/WebCore/platform/win/WebCoreInstanceHandle.h +file Source/WebCore/platform/win # macOS-specific code file Source/WTF/wtf/cf |