diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-13 16:33:42 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-13 16:40:57 +0000 |
commit | 5ad6d45d88e020da039872d3187416547b11e605 (patch) | |
tree | d3996336ef362ed17046244817f1acd38ab602f8 /config.tests | |
parent | 1a70d36b8908f81710e2db9018ccb48d97749cd3 (diff) |
Fix libvpx check
We no longer depend on a custom configuration of libvpx and shouldn't
check for non-standard headers.
Also fixes bitrot in the config.test.
Task-number: QTBUG-50554
Change-Id: I7b625e735536f7a79e41d036b7b8dc4d79f2262b
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/libvpx/libvpx.cpp | 2 | ||||
-rw-r--r-- | config.tests/libvpx/libvpx.pro | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config.tests/libvpx/libvpx.cpp b/config.tests/libvpx/libvpx.cpp index ec261cd5a..d4b34c6b5 100644 --- a/config.tests/libvpx/libvpx.cpp +++ b/config.tests/libvpx/libvpx.cpp @@ -26,8 +26,8 @@ ** ****************************************************************************/ -#include <vpx/svc_context.h> #include <vpx/vpx_frame_buffer.h> +#include <vpx/vp8cx.h> #include <vpx/vp8dx.h> #ifndef VPX_CTRL_VPXD_GET_LAST_QUANTIZER diff --git a/config.tests/libvpx/libvpx.pro b/config.tests/libvpx/libvpx.pro index aff6d1857..13ce13647 100644 --- a/config.tests/libvpx/libvpx.pro +++ b/config.tests/libvpx/libvpx.pro @@ -1,3 +1,4 @@ SOURCES += libvpx.cpp -PKGCONFIG += libvpx +CONFIG += link_pkgconfig +PKGCONFIG += vpx CONFIG -= qt |