diff options
| author | aavit <eirik.aavitsland@digia.com> | 2013-11-22 15:49:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-28 02:54:26 +0100 |
| commit | 515617e55be9a7bfa738a9c32ef8b19065de37d4 (patch) | |
| tree | 3633ce2f1b6902bc9f9b8c7b5ab30d181535daa1 /config.tests | |
| parent | d9ee8c7626f4cb6fb1814be8e27addccd4e59963 (diff) | |
| download | qt4-tools-515617e55be9a7bfa738a9c32ef8b19065de37d4.tar.gz | |
Recognize newer libmng versions in config test
libmng 2.0.x has been released and is compatible and usable, but since
it no longer provides a VERSION_MAJOR macro, the config test would fail.
Task-number: QTBUG-34894
Change-Id: I36f6ed9d69dbae88feb1b88ce099bf36c9283133
Reviewed-by: Liang Qi <liang.qi@digia.com>
(cherry picked from qtimageformats/9ae386653c321c8ddc10fad5ea88f32ebb3d3ffe)
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/libmng/libmng.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.tests/unix/libmng/libmng.cpp b/config.tests/unix/libmng/libmng.cpp index 0fbe554cf0..9db10ffae8 100644 --- a/config.tests/unix/libmng/libmng.cpp +++ b/config.tests/unix/libmng/libmng.cpp @@ -46,9 +46,11 @@ int main(int, char **) mng_handle hMNG; mng_cleanup(&hMNG); +#if defined(MNG_VERSION_MAJOR) #if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9) #error System libmng version is less than 1.0.9; using built-in version instead. #endif +#endif return 0; } |