diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-05 10:44:04 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-05 10:44:48 +0100 |
| commit | d51abed57a8f677a0d4eac57fd3f16bd4662190a (patch) | |
| tree | b3e173db4b72edbff6cb8dcc203c3d4526a1b51b /mkspecs/features/qt_module_config.prf | |
| parent | 07ae18f96e87a2db40ae014f28893f1080efa7ae (diff) | |
| parent | 0862d7f78af978cf513097b3bdc33cd8096dee75 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Change-Id: Ibcb1f7070f50968b77b66112750ce5c70fc0b6d0
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 ad6990657b..98cdab121f 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -116,10 +116,8 @@ embedded:DEPENDPATH += ;$$EMBEDDED_H #install directives load(qt_installs) -unix { - CONFIG += create_libtool create_pc explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] - QMAKE_PRL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] ### XXX +unix|win32-g++* { + CONFIG += create_pc QMAKE_PKGCONFIG_LIBDIR = $$[QT_RAW_INSTALL_LIBS] QMAKE_PKGCONFIG_INCDIR = $$[QT_RAW_INSTALL_HEADERS]/$$TARGET QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_RAW_INSTALL_HEADERS] @@ -130,17 +128,15 @@ unix { lib_replace.replace = $$[QT_RAW_INSTALL_LIBS] prefix_replace.match = $$QT_BUILD_TREE prefix_replace.replace = $$[QT_RAW_INSTALL_PREFIX] - 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 } -win32-g++* { - CONFIG += create_pc - QMAKE_PKGCONFIG_LIBDIR = $$[QT_RAW_INSTALL_LIBS] - QMAKE_PKGCONFIG_INCDIR = $$[QT_RAW_INSTALL_HEADERS]/$$TARGET - QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_RAW_INSTALL_HEADERS] - QMAKE_PKGCONFIG_DESTDIR = pkgconfig +unix { + CONFIG += create_libtool explicitlib + QMAKE_PRL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] ### XXX + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + QMAKE_LIBTOOL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] + QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace } contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE |