From 52e775b4d0e59dfb44c22b070f272dbc21014389 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sat, 27 Dec 2014 19:36:19 +0100 Subject: Disable pthread_np.h on BSD w/ GNU libc pthread_np.h exists on BSD userlands only, so do not enable it on BSD kernels with GNU libc/userland (e.g. GNU/kFreeBSD). Change-Id: Ic9bb2221531322ce425543c85155cfafc5294c41 Reviewed-by: Simon Hausmann --- src/3rdparty/javascriptcore/JavaScriptCore/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h index 6be10fc..07f76b2 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/config.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h @@ -53,7 +53,7 @@ #endif -#if OS(FREEBSD) || OS(OPENBSD) +#if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__) #define HAVE_PTHREAD_NP_H 1 #endif -- cgit v1.2.1 From b459510d57fe78c09adbe3148655e0e3de7776c9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 16 Jan 2015 21:06:52 +0100 Subject: Bump version Change-Id: Iaac75269e48783982eb722b3386978e97da2062e --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index ccd239a..35f43d5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.4.1 +MODULE_VERSION = 5.4.2 -- cgit v1.2.1