diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
| commit | f27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (patch) | |
| tree | d84389d3c2a37b38435e0be5259f48e5f04290e0 /config.tests | |
| parent | a8c98dcb89f2b3f8438555d8febe17d3542d0567 (diff) | |
| parent | 0d720a000f4f35c5ea6942426efec6847b06f4ce (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If6ba05867e7c98159e1b94ff71923e8b36bdbccb
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/cloexec/cloexec.cpp | 4 | ||||
| -rw-r--r-- | config.tests/unix/libpng/libpng.pro | 7 | ||||
| -rw-r--r-- | config.tests/unix/posix_fallocate/posix_fallocate.cpp | 4 | ||||
| -rw-r--r-- | config.tests/unix/sqlite/sqlite.cpp | 1 |
4 files changed, 15 insertions, 1 deletions
diff --git a/config.tests/unix/cloexec/cloexec.cpp b/config.tests/unix/cloexec/cloexec.cpp index 2cd62c925d..cc6948a280 100644 --- a/config.tests/unix/cloexec/cloexec.cpp +++ b/config.tests/unix/cloexec/cloexec.cpp @@ -50,6 +50,10 @@ int main() (void) pipe2(pipes, O_CLOEXEC | O_NONBLOCK); (void) fcntl(0, F_DUPFD_CLOEXEC, 0); (void) dup3(0, 3, O_CLOEXEC); +#if defined(__NetBSD__) + (void) paccept(0, 0, 0, NULL, SOCK_CLOEXEC | SOCK_NONBLOCK); +#else (void) accept4(0, 0, 0, SOCK_CLOEXEC | SOCK_NONBLOCK); +#endif return 0; } diff --git a/config.tests/unix/libpng/libpng.pro b/config.tests/unix/libpng/libpng.pro index 4e50fe26e5..cdca43171c 100644 --- a/config.tests/unix/libpng/libpng.pro +++ b/config.tests/unix/libpng/libpng.pro @@ -1,3 +1,8 @@ SOURCES = libpng.cpp CONFIG -= qt dylib -LIBS += -lpng +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += libpng +} else { + LIBS += -lpng +} diff --git a/config.tests/unix/posix_fallocate/posix_fallocate.cpp b/config.tests/unix/posix_fallocate/posix_fallocate.cpp index dd39eec7b9..ce1286813a 100644 --- a/config.tests/unix/posix_fallocate/posix_fallocate.cpp +++ b/config.tests/unix/posix_fallocate/posix_fallocate.cpp @@ -38,6 +38,10 @@ ****************************************************************************/ #include <fcntl.h> +// NetBSD 7 has posix_fallocate, but in unistd.h instead of fcntl.h +#ifdef __NetBSD__ +# include <unistd.h> +#endif int main(int, char **) { diff --git a/config.tests/unix/sqlite/sqlite.cpp b/config.tests/unix/sqlite/sqlite.cpp index 6ea2386a48..dd17f74101 100644 --- a/config.tests/unix/sqlite/sqlite.cpp +++ b/config.tests/unix/sqlite/sqlite.cpp @@ -41,5 +41,6 @@ int main(int, char **) { + sqlite3_open_v2(0, 0, 0, 0); return 0; } |