From 1e3015d8f4c5b3c04e412dfa8f87def0922c52d9 Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Wed, 8 Feb 2012 13:52:01 +0100 Subject: [PATCH] Activate replacements when installing .pc files for win32 Change-Id: Iaacbe8528bdbe1c1fca60ae8c94625e951f14554 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_module_config.prf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 4bec33c..e106c3f 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -122,21 +122,21 @@ unix|win32-g++* { QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS] QMAKE_PKGCONFIG_DESTDIR = pkgconfig -} - -unix { - CONFIG += create_libtool explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS] - QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS] include_replace.match = $$QMAKE_INCDIR_QT include_replace.replace = $$[QT_INSTALL_HEADERS] lib_replace.match = $$QMAKE_LIBDIR_QT lib_replace.replace = $$[QT_INSTALL_LIBS] prefix_replace.match = $$QT_BUILD_TREE prefix_replace.replace = $$[QT_INSTALL_PREFIX] + QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace +} + +unix { + CONFIG += create_libtool explicitlib + QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS] + QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS] QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace - QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace } contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE -- 2.7.4