diff options
| author | Hib Eris <hib@hiberis.nl> | 2012-02-08 16:13:42 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-29 00:05:38 +0100 |
| commit | 525d98725b72984e3d2526415829b763fc7654ea (patch) | |
| tree | 73aecf9c9a8aece3f584edb64046b582f54ec4d8 /mkspecs/features/qt_module_config.prf | |
| parent | 4a82f78dea36c297b5a4a44853936cc733de8197 (diff) | |
De-duplicate platform-dependent paths
Change-Id: Ifee9f05fc8d924877f24edfddb0dc5e324a29080
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/features/qt_module_config.prf')
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index a8439198df..4bec33cfd1 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -116,14 +116,18 @@ embedded:DEPENDPATH += ;$$EMBEDDED_H #install directives load(qt_installs) -unix { - CONFIG += create_libtool create_pc explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS] - QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS] +unix|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 +} + +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 @@ -135,14 +139,6 @@ unix { 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 DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code |