diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:03:20 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:03:20 +0100 |
| commit | b87b74fb71c9669063e444db5a9e00604b61a304 (patch) | |
| tree | 27acda811569350bdf4ab4cf34c6245887a615a8 | |
| parent | f84ba2e7ddf4c50fab0bfc0be318d7f1425b17af (diff) | |
| parent | b742f21e41ee60a4fbb2d0efeed4d518f72590c7 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ib695c2e2c8629e1947c24ba6510ecb4194b949dc
| -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; } |