diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 12:19:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:24 +0000 |
| commit | 6b35497375c07c49cca7317a4452acc6adc7a1cd (patch) | |
| tree | 5531da6c89bb3da6495e8c83a0b86bff638f3baa /configure.json | |
| parent | 91e13af7e1056a7bad83eb34ebf63fdd45e24bea (diff) | |
Basic adaptations for 65-based
Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/configure.json b/configure.json index 1adc5992b..ce12b05b6 100644 --- a/configure.json +++ b/configure.json @@ -175,6 +175,28 @@ { "type": "pkgConfig", "args": "libpng >= 1.6.0" } ] }, + "webengine-jpeglib": { + "label": "compatible jpeglib", + "type": "compile", + "test": { + "head": [ + "#include <cstdio>", + "#include <cstring>", + "extern \"C\" {", + " #include <jpeglib.h>", + "}" + ], + "main": [ + "JDIMENSION dummy;", + "jpeg_crop_scanline(nullptr, &dummy, &dummy);", + "jpeg_skip_scanlines(nullptr, dummy);" + ] + }, + "sources": [ + { "type": "pkgConfig", "args": "libjpeg" }, + "-ljpeg" + ] + }, "webengine-lcms2": { "label": "lcms2", "sources": [ @@ -184,7 +206,7 @@ }, "tests" : { - "alsa": { + "webengine-alsa": { "label": "alsa", "test": "alsa", "type": "compile" @@ -357,6 +379,11 @@ "condition": "config.unix && features.system-png && libs.webengine-png", "output": [ "privateFeature" ] }, + "webengine-system-jpeg" : { + "label": "JPEG", + "condition": "config.unix && features.system-jpeg && libs.webengine-jpeglib", + "output": [ "privateFeature" ] + }, "webengine-python2": { "label": "python2", "condition": "tests.webengine-python2", @@ -398,7 +425,7 @@ }, "webengine-alsa": { "label": "Use ALSA", - "condition": "config.unix && tests.alsa", + "condition": "config.unix && tests.webengine-alsa", "output": [ "privateFeature" ] }, "webengine-v8-snapshot": { @@ -658,6 +685,7 @@ "webengine-system-libxml2", "webengine-system-lcms2", "webengine-system-png", + "webengine-system-jpeg", "webengine-system-harfbuzz" ] }, |