summaryrefslogtreecommitdiffstats
path: root/src/qbase.pri
diff options
context:
space:
mode:
authorHib Eris <hib@hiberis.nl>2012-02-08 12:52:01 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-29 16:47:25 (GMT)
commit23439b7f2ce84661d8fd5800aabfbfd46014dd63 (patch)
treeb779ca327f9fc521abe5be6ef1b22c0ca01a1189 /src/qbase.pri
parent54bfc2fc73bf1d612743f6ea49fcb3740784d9ee (diff)
downloadQt-23439b7f2ce84661d8fd5800aabfbfd46014dd63.zip
Qt-23439b7f2ce84661d8fd5800aabfbfd46014dd63.tar.gz
Qt-23439b7f2ce84661d8fd5800aabfbfd46014dd63.tar.bz2
Activate replacements when installing .pc files for win32
(backported from qtbase commit 1e3015d8f4c5b3c04e412dfa8f87def0922c52d9) Change-Id: Iaacbe8528bdbe1c1fca60ae8c94625e951f14554 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/qbase.pri')
-rw-r--r--src/qbase.pri14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qbase.pri b/src/qbase.pri
index 56cb2e4..e0641f5 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -141,21 +141,21 @@ unix|win32-g++*:!symbian {
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-}
-
-unix:!symbian {
- 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:!symbian {
+ 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