diff options
| author | aavit <eirik.aavitsland@digia.com> | 2013-11-22 15:04:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-25 11:24:54 +0100 |
| commit | 9ae386653c321c8ddc10fad5ea88f32ebb3d3ffe (patch) | |
| tree | e8acda5f7e5beb6fe615cf3aa88522393dd333c8 /config.tests | |
| parent | d507c358b803cd40ec13ed19e00eced80b732571 (diff) | |
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: I106aa258de0851af01d1bb016c2971dd8e30fd24
Reviewed-by: Liang Qi <liang.qi@digia.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/libmng/libmng.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.tests/libmng/libmng.cpp b/config.tests/libmng/libmng.cpp index 9def33e..fc3e693 100644 --- a/config.tests/libmng/libmng.cpp +++ b/config.tests/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; } |