Skip to content

Commit

Permalink
Recognize newer libmng versions in config test
Browse files Browse the repository at this point in the history
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 <[email protected]>
(cherry picked from qtimageformats/9ae386653c321c8ddc10fad5ea88f32ebb3d3ffe)
  • Loading branch information
aavit authored and The Qt Project committed Nov 28, 2013
1 parent d9ee8c7 commit 515617e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions config.tests/unix/libmng/libmng.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ 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;
Expand Down

0 comments on commit 515617e

Please sign in to comment.