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-10 13:08:05 +0200 |
commit | 81cbb264cb9446c4408124d50aeff50164ad0ab4 (patch) | |
tree | 6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Tools/qt/manifest.txt | |
parent | beaeeb99881184fd368c121fcbb1a31c78b794a3 (diff) | |
parent | 5087e0ced43d813eb6f765913a6fc3958d2a7a9d (diff) | |
download | qtwebkit-81cbb264cb9446c4408124d50aeff50164ad0ab4.tar.gz |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I4e185b15690118515df80a79b786cbb8b30dd144
Diffstat (limited to 'Tools/qt/manifest.txt')
-rw-r--r-- | Tools/qt/manifest.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tools/qt/manifest.txt b/Tools/qt/manifest.txt index 6fe3e9546..39414cc5f 100644 --- a/Tools/qt/manifest.txt +++ b/Tools/qt/manifest.txt @@ -99,8 +99,9 @@ file Source/WebKit/win/Plugins # Version file Source/WebKit/mac/Configurations/Version.xcconfig -# Move LICENSE.LGPLv21 to the root +# Move LICENSE.LGPLv21 and README to the root file Source/WebKit/qt/LICENSE.LGPLv21 LICENSE.LGPLv21 +file Source/WebKit/qt/README README directory Source/WebInspectorUI/UserInterface/Images exclude Source/WebInspectorUI/UserInterface/Images/.* |