diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-30 15:43:24 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:05 +0000 |
| commit | a0be5222b8695aed31664ab4e8e804632569ed64 (patch) | |
| tree | fe477e98b7aecd302b2176264046ceac0cfe6236 /Tools | |
| parent | 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (diff) | |
Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3
Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/QtTestBrowser/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tools/TestWebKitAPI/PlatformQt.cmake | 1 | ||||
| -rwxr-xr-x | Tools/qt/make-snapshot.pl | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt index 1ee49365a..485cd0ca1 100644 --- a/Tools/QtTestBrowser/CMakeLists.txt +++ b/Tools/QtTestBrowser/CMakeLists.txt @@ -41,6 +41,7 @@ set(QtTestBrowser_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} WebKitWidgets + ${STATIC_LIB_DEPENDENCIES} ) qt_wrap_cpp(WebKit QtTestBrowser_SOURCES diff --git a/Tools/TestWebKitAPI/PlatformQt.cmake b/Tools/TestWebKitAPI/PlatformQt.cmake index 08d94c0d8..fe3808685 100644 --- a/Tools/TestWebKitAPI/PlatformQt.cmake +++ b/Tools/TestWebKitAPI/PlatformQt.cmake @@ -35,6 +35,7 @@ set(test_webcore_LIBRARIES WebCore gtest ${Qt5Gui_LIBRARIES} + ${DEPEND_STATIC_LIBS} ) add_executable(TestWebCore diff --git a/Tools/qt/make-snapshot.pl b/Tools/qt/make-snapshot.pl index 27c5621d6..b8a527e3f 100755 --- a/Tools/qt/make-snapshot.pl +++ b/Tools/qt/make-snapshot.pl @@ -28,6 +28,8 @@ my @commands = ( "Tools/gtk/make-dist.py -t snapshot Tools/qt/manifest.txt", "cd $target_repo", "git rm -rf *", + "git reset -- dist LICENSE.LGPLv21", + "git checkout -- dist LICENSE.LGPLv21", "tar -xf $src_repo/snapshot.tar --strip-components=1", "git add -A", "rm $src_repo/snapshot.tar", |