diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-03-29 10:02:17 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-04-15 20:11:03 +0000 |
| commit | dd22889ed63599d44baa3bcb0fff6f75f328ff50 (patch) | |
| tree | cadf48b87611e203f3b4bf85f40078f6f0e5ed15 /src/corelib/tools | |
| parent | a4a83f52f9ee862d703c21dcd9915ebfd7c72ac5 (diff) | |
Change the way we handle features that have sub-features
Make sure we always set the base feature as a flag in qtconfig, and
set the sub-feature in addition if it's being used.
Change-Id: Icfeb0ec1ac9e1a615b5b22eb5fcce47e0e7fc153
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/tools.pri | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 95a7ece67c..07200b1249 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -197,12 +197,10 @@ INCLUDEPATH += ../3rdparty/md5 \ ../3rdparty/md4 \ ../3rdparty/sha3 -contains(QT_CONFIG, doubleconversion) { - include($$PWD/../../3rdparty/double-conversion/double-conversion.pri) -} else:contains(QT_CONFIG, system-doubleconversion) { +contains(QT_CONFIG, system-doubleconversion) { LIBS_PRIVATE += -ldouble-conversion -} else { - DEFINES += QT_NO_DOUBLECONVERSION +} else: contains(QT_CONFIG, doubleconversion) { + include($$PWD/../../3rdparty/double-conversion/double-conversion.pri) } # Note: libm should be present by default becaue this is C++ |