diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-11 10:25:38 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-03-11 10:25:38 +0000 |
commit | c305cc06c74cb95ef2ddfacee0ede1d82e3dbb3c (patch) | |
tree | e09e2ccbc9bda8f46737c89e8b2297061d6daade /qtwebengine.pro | |
parent | f658dcb0893e7869cc0c029bfe0be82838af4bb8 (diff) | |
parent | ccf12049b662fe1b03b5b0ea199d29b32f072eda (diff) | |
download | qtwebengine-c305cc06c74cb95ef2ddfacee0ede1d82e3dbb3c.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
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/* |