diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:55:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:19 +0000 |
| commit | 190e9dcdcf1a2debfbf624af4cb2154172908a64 (patch) | |
| tree | 3feb15de63b05cda8339d784c46f929ad4000357 /src/corelib/configure.cmake | |
| parent | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (diff) | |
Regenerate files after dev -> wip/cmake merge
Note the following bigger things that had to be done:
Handle GSS library / feature with a new custom find module.
Implement rudimentary support for relocatability (does not currently
handle extprefix).
Change-Id: Ic6cd27dda7ebca9829f51cb42ea76fff6d1767ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/configure.cmake')
| -rw-r--r-- | src/corelib/configure.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 631958b2d7..6ca29a8fc9 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -488,10 +488,6 @@ qt_feature("clock_monotonic" PUBLIC CONDITION QT_FEATURE_clock_gettime AND TEST_clock_monotonic ) qt_feature_definition("clock_monotonic" "QT_NO_CLOCK_MONOTONIC" NEGATE VALUE "1") -qt_feature("dlopen" PRIVATE - LABEL "dlopen()" - CONDITION UNIX -) qt_feature("cxx11_future" PUBLIC LABEL "C++11 <future>" CONDITION TEST_cxx11_future @@ -699,7 +695,7 @@ qt_feature_definition("textdate" "QT_NO_TEXTDATE" NEGATE VALUE "1") qt_feature("datestring" PUBLIC SECTION "Data structures" LABEL "QDate/QTime/QDateTime" - PURPOSE "Provides convertion between dates and strings." + PURPOSE "Provides conversion between dates and strings." CONDITION QT_FEATURE_textdate ) qt_feature_definition("datestring" "QT_NO_DATESTRING" NEGATE VALUE "1") |