summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-12-12 11:34:42 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2017-12-13 06:50:53 +0000
commit98b7ad7682c6bf0e944fb01e17b8ea4ac78a5a7b (patch)
treeafa16f093aae2d7326402c99a05a7626da2a27a7 /src
parent782eb1a114c0aaa729925899b2061d47f494435f (diff)
QNX: fix slog2 for QNX7
Change the include header to sys/slog2.h, which is available in both QNX 6.6.0 and 7. Task-number: QTBUG-64033 Change-Id: I26d8c5451376bab33e11f4784ca772f84cd6fc28 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/configure.json2
-rw-r--r--src/corelib/global/qlogging.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index a5b69a2df6..3db9942123 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -178,7 +178,7 @@
"slog2": {
"label": "slog2",
"test": {
- "include": "slog2.h",
+ "include": "sys/slog2.h",
"main": "slog2_set_default_buffer((slog2_buffer_t)-1);"
},
"export": "",
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index b5ba935194..1307118bdf 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -61,7 +61,7 @@
#include <qt_windows.h>
#endif
#if QT_CONFIG(slog2)
-#include <slog2.h>
+#include <sys/slog2.h>
#endif
#ifdef Q_OS_ANDROID