From 54bfc2fc73bf1d612743f6ea49fcb3740784d9ee Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Wed, 8 Feb 2012 16:13:42 +0100 Subject: De-duplicate platform-dependent paths (backported from qtbase commit 525d98725b72984e3d2526415829b763fc7654ea) Change-Id: Ifee9f05fc8d924877f24edfddb0dc5e324a29080 Reviewed-by: Oswald Buddenhagen --- src/qbase.pri | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/qbase.pri b/src/qbase.pri index 13d4adf2ce..56cb2e4ee0 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -135,14 +135,18 @@ embedded:DEPENDPATH += ;$$EMBEDDED_H #install directives include(qt_install.pri) -unix:!symbian { - CONFIG += create_libtool create_pc explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS] - QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS] +unix|win32-g++*:!symbian { + CONFIG += create_pc QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] 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 @@ -154,14 +158,6 @@ unix:!symbian { QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace } -win32-g++* { - CONFIG += create_pc - QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET - QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS] - QMAKE_PKGCONFIG_DESTDIR = pkgconfig -} - contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT -- cgit v1.2.3