diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-10 23:27:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-10 23:27:10 +0200 |
| commit | cbe332405aa22257d432f1797b325f5e57007c20 (patch) | |
| tree | 0d817dc7ed2f3a2f6035f924a824d351420910c5 /config.tests | |
| parent | d2c6294bd5cc3c2e61aaa0c83bfd74941ced150e (diff) | |
| parent | 67ca72796e23269451795baf9adde02a184a7b9e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
configure
mkspecs/macx-ios-clang/features/default_pre.prf
mkspecs/macx-ios-clang/features/sdk.prf
mkspecs/unsupported/freebsd-g++46/qplatformdefs.h
src/widgets/styles/qgtkstyle.cpp
tests/auto/corelib/io/qdiriterator/qdiriterator.pro
tests/auto/corelib/io/qfileinfo/qfileinfo.pro
Change-Id: Ia943555d1e59234a66f7dc65bdfda838e40001b5
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/clock-gettime/clock-gettime.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/unix/clock-gettime/clock-gettime.cpp b/config.tests/unix/clock-gettime/clock-gettime.cpp index 48775e36c9..486cdc6b38 100644 --- a/config.tests/unix/clock-gettime/clock-gettime.cpp +++ b/config.tests/unix/clock-gettime/clock-gettime.cpp @@ -42,7 +42,7 @@ int main(int, char **) { -#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0) +#if (defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0)) || defined(__OpenBSD__) timespec ts; clock_gettime(CLOCK_REALTIME, &ts); #else |