diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-05 20:54:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-06 12:49:02 +0100 |
| commit | 787373d376785af56f3ea9abc7096c2c3522b5f0 (patch) | |
| tree | 45248a82a82fc92eb6b10753992a9d0fae582ec0 /mkspecs | |
| parent | ccea7b71142bf41d4f8e7cb413834135bfa2c81e (diff) | |
export only 'host_bins' to pkg-config, rather than a random selection of tools
the "export location" of the linguist tools was just bogus, and lconvert
was missing anyway. the two dbus tools and qdoc were missing, too.
generally, it seems useless to report the paths of some random tools -
instead, just report the install location of the host binaries and let
users figure out the complete paths themselves - this should be ok, as
we decided that distributors are not supposed to do tool renaming any
more.
for the binary path just use the final location, as the files won't be
used before installation anyway. this allows us removing the scary
generic prefix replace from the pc file installs.
and as a side effect this also fixes debug_and_release builds of core
and widgets by not loading various prf files prematurely and thereby
messing up the dir replacement magic.
Task-number: QTBUG-28286
Change-Id: I99de419301fc07fb923959db4bd5cab9072d1c31
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index b8de8e9965..457ab7e2d9 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -178,9 +178,7 @@ unix|win32-g++* { include_replace.replace = $$[QT_INSTALL_HEADERS/raw] lib_replace.match = $$[QT_INSTALL_LIBS/get] lib_replace.replace = $$[QT_INSTALL_LIBS/raw] - prefix_replace.match = $$QT_BUILD_TREE - prefix_replace.replace = $$[QT_INSTALL_PREFIX/raw] - QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace + QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace } unix { |