diff options
| -rw-r--r-- | config.tests/unix/clock-gettime/clock-gettime.pri | 2 | ||||
| -rw-r--r-- | config.tests/unix/clock-gettime/clock-gettime.pro | 1 | ||||
| -rw-r--r-- | config.tests/unix/clock-monotonic/clock-monotonic.pro | 1 | ||||
| -rw-r--r-- | src/corelib/configure.json | 18 | ||||
| -rw-r--r-- | src/corelib/kernel/kernel.pri | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/config.tests/unix/clock-gettime/clock-gettime.pri b/config.tests/unix/clock-gettime/clock-gettime.pri deleted file mode 100644 index 65b49fb8b4..0000000000 --- a/config.tests/unix/clock-gettime/clock-gettime.pri +++ /dev/null @@ -1,2 +0,0 @@ -# clock_gettime() is implemented in librt on these systems -linux-*|hpux-*|solaris-*:LIBS_PRIVATE *= -lrt diff --git a/config.tests/unix/clock-gettime/clock-gettime.pro b/config.tests/unix/clock-gettime/clock-gettime.pro index bdbb1c2a82..985b94e3fe 100644 --- a/config.tests/unix/clock-gettime/clock-gettime.pro +++ b/config.tests/unix/clock-gettime/clock-gettime.pro @@ -1,3 +1,2 @@ SOURCES = clock-gettime.cpp CONFIG -= qt dylib -include(clock-gettime.pri) diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.pro b/config.tests/unix/clock-monotonic/clock-monotonic.pro index 253a9f7346..4c421c2413 100644 --- a/config.tests/unix/clock-monotonic/clock-monotonic.pro +++ b/config.tests/unix/clock-monotonic/clock-monotonic.pro @@ -1,3 +1,2 @@ SOURCES = clock-monotonic.cpp CONFIG -= qt dylib -include(../clock-gettime/clock-gettime.pri) diff --git a/src/corelib/configure.json b/src/corelib/configure.json index c6c5c93ddb..deb7a544ef 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -84,6 +84,14 @@ "-ldl" ] }, + "librt": { + "label": "clock_gettime()", + "test": "unix/clock-gettime", + "sources": [ + "", + "-lrt" + ] + }, "pcre2": { "label": "PCRE2", "test": "unix/pcre2", @@ -119,15 +127,11 @@ "type": "compile", "test": "common/atomicfptr" }, - "clock-gettime": { - "label": "clock_gettime()", - "type": "compile", - "test": "unix/clock-gettime" - }, "clock-monotonic": { "label": "POSIX monotonic clock", "type": "compile", - "test": "unix/clock-monotonic" + "test": "unix/clock-monotonic", + "use": "librt" }, "cloexec": { "label": "O_CLOEXEC", @@ -199,7 +203,7 @@ "features": { "clock-gettime": { "label": "clock_gettime()", - "condition": "tests.clock-gettime", + "condition": "config.unix && libs.librt", "output": [ "privateFeature" ] }, "clock-monotonic": { diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index 0e6ff17b8f..29bd5bbc6c 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -162,7 +162,7 @@ unix|integrity { QMAKE_USE_PRIVATE += glib } - qtConfig(clock-gettime): include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri) + qtConfig(clock-gettime): QMAKE_USE_PRIVATE += librt !android { SOURCES += kernel/qsharedmemory_posix.cpp \ |