diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:06:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:06:55 +0100 |
| commit | 79f2b17b3e08e6a18e3c02dea98620ad372042eb (patch) | |
| tree | f54beadb6331f7901f38648519dd972d45eb72be | |
| parent | 7962483cc9f6fa1c9b0f0341de9bf2f3f0f53dc7 (diff) | |
| parent | b459510d57fe78c09adbe3148655e0e3de7776c9 (diff) | |
| download | qtscript-79f2b17b3e08e6a18e3c02dea98620ad372042eb.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I7b5322df40680614250e1e6327879ff683c03df5
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |