diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-12 20:19:33 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:26:43 +0000 |
commit | 4b288e30efda67212b54d7f2e084d0f3acc594ae (patch) | |
tree | 80c91ddce64731a15d208e0ba9dfdc0f99b2029b /src/corelib | |
parent | d5dc46d319bb1f58f8a0ba64d2ef270eecbe8e65 (diff) |
employ QMAKE_USE: LIBS += -lfoo
this switches all instances of LIBS[_PRIVATE] += -lfoo where a config
tests exists for foo.
this removes some code duplication between tests and project files (in
case of conditionals), and ensures that the projects always actually use
the libraries configure has found.
Change-Id: Ia7e80c8db5f329290c7f1a4e03a8bf78882a687e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/arch/arch.pri | 2 | ||||
-rw-r--r-- | src/corelib/codecs/codecs.pri | 2 | ||||
-rw-r--r-- | src/corelib/kernel/kernel.pri | 2 | ||||
-rw-r--r-- | src/corelib/tools/tools.pri | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index 0f7c2b887b..2b9166f0a6 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -4,4 +4,4 @@ HEADERS += \ arch/qatomic_bootstrap.h \ arch/qatomic_cxx11.h -atomic64-libatomic: LIBS += -latomic +atomic64-libatomic: QMAKE_USE += libatomic diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index fdaec33c5a..275ade369a 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -46,7 +46,7 @@ contains(QT_CONFIG,icu) { SOURCES += codecs/qiconvcodec.cpp contains(QT_CONFIG, gnu-libiconv) { DEFINES += GNU_LIBICONV - LIBS_PRIVATE *= -liconv + QMAKE_USE_PRIVATE += iconv } else: contains(QT_CONFIG, sun-libiconv) { DEFINES += GNU_LIBICONV } diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index 8e45766f17..fea0d4ae2e 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -183,7 +183,7 @@ vxworks { } qqnx_pps { - LIBS_PRIVATE += -lpps + QMAKE_USE_PRIVATE += pps SOURCES += \ kernel/qppsattribute.cpp \ kernel/qppsobject.cpp diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 853827e032..252dcf9fdc 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -193,7 +193,7 @@ INCLUDEPATH += ../3rdparty/md5 \ ../3rdparty/sha3 contains(QT_CONFIG, system-doubleconversion) { - LIBS_PRIVATE += -ldouble-conversion + QMAKE_USE_PRIVATE += doubleconversion } else: contains(QT_CONFIG, doubleconversion) { include($$PWD/../../3rdparty/double-conversion/double-conversion.pri) } |