export QT_CONFIG only in Qt5Core.pc
there is no point in duplicating the information in every module. host_bins is exported only here as well. Change-Id: I2f816e1cade9761a2c0d97c7ca1c90293095bfb1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
6944c01200
commit
bf915eeea2
@ -172,10 +172,6 @@ win32 {
|
||||
|
||||
TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
|
||||
|
||||
qt_conf.name = qt_config
|
||||
qt_conf.variable = QT_CONFIG
|
||||
QMAKE_PKGCONFIG_VARIABLES += qt_conf
|
||||
|
||||
load(qt_targets)
|
||||
|
||||
win32:DEFINES+=_USE_MATH_DEFINES
|
||||
|
@ -54,7 +54,10 @@ HOST_BINS = $$[QT_HOST_BINS/raw]
|
||||
host_bins.name = host_bins
|
||||
host_bins.variable = HOST_BINS
|
||||
|
||||
QMAKE_PKGCONFIG_VARIABLES += host_bins
|
||||
qt_conf.name = qt_config
|
||||
qt_conf.variable = QT_CONFIG
|
||||
|
||||
QMAKE_PKGCONFIG_VARIABLES += host_bins qt_conf
|
||||
|
||||
ctest_macros_file.input = $$PWD/Qt5CTestMacros.cmake
|
||||
ctest_macros_file.output = $$DESTDIR/cmake/Qt5Core/Qt5CTestMacros.cmake
|
||||
|
Loading…
Reference in New Issue
Block a user