From 9ae386653c321c8ddc10fad5ea88f32ebb3d3ffe Mon Sep 17 00:00:00 2001 From: aavit Date: Fri, 22 Nov 2013 15:04:23 +0100 Subject: 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 --- config.tests/libmng/libmng.cpp | 2 ++ 1 file changed, 2 insertions(+) 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,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; -- cgit v1.2.1 From b742f21e41ee60a4fbb2d0efeed4d518f72590c7 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 25 Nov 2013 12:47:18 +0100 Subject: Bump MODULE_VERSION to 5.2.1 Change-Id: I979cdf4dd3f1a8d2e3b73c9fce8507a4ce97198d Reviewed-by: Matti Paaso Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 2f09a2b..45d05b2 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.2.0 +MODULE_VERSION = 5.2.1 -- cgit v1.2.1