diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 10:40:49 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 10:40:49 +0100 |
commit | ccf12049b662fe1b03b5b0ea199d29b32f072eda (patch) | |
tree | 43e3d0042eb1f8ba23349e10c9c7e547fab57fec /qtwebengine.pro | |
parent | 56714be7d05afb94c63b658a4fdb2bedd1bee645 (diff) | |
parent | 471d484bea6b8b84749b8d89c603cb8394f1b5ee (diff) | |
download | qtwebengine-ccf12049b662fe1b03b5b0ea199d29b32f072eda.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
Diffstat (limited to 'qtwebengine.pro')
-rw-r--r-- | qtwebengine.pro | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/qtwebengine.pro b/qtwebengine.pro index 5156e4620..3d20cc2f4 100644 --- a/qtwebengine.pro +++ b/qtwebengine.pro @@ -1,2 +1,12 @@ load(qt_build_config) load(qt_parts) + +OTHER_FILES = \ + tools/buildscripts/* \ + tools/scripts/* \ + tools/qmake/config.tests/khr/* \ + tools/qmake/config.tests/libcap/* \ + tools/qmake/config.tests/libvpx/* \ + tools/qmake/config.tests/snappy/* \ + tools/qmake/config.tests/srtp/* \ + tools/qmake/mkspecs/features/* |