diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-09 19:11:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 11:01:02 +0100 |
| commit | aed6eaa5b211a4676c15627657f3a7bda6e3866d (patch) | |
| tree | c6cf7554155db900d4212bda7617eda34921a249 /mkspecs/features/qt_module_config.prf | |
| parent | 197ba93cf06bd57fecf9d1b2e54a778113962248 (diff) | |
QT_RAW_INSTALL_FOO => QT_INSTALL_FOO/raw
this makes the "sysrootable" properties more magic, with the raw
versions being omitted from the qmake -query output and automatically
falling back to the "cooked" variant if there is no sysroot set.
this makes the "normal" qmake -query less noisy. this will become even
more obvious when i add more "overloads" of the properties.
Change-Id: I08000986427264ec6238c8fe0a77f5cecdbf1201
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/features/qt_module_config.prf')
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 98cdab121f..cae5f47387 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -118,24 +118,24 @@ load(qt_installs) 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] + QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]/$$TARGET + QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_DESTDIR = pkgconfig include_replace.match = $$QMAKE_INCDIR_QT - include_replace.replace = $$[QT_RAW_INSTALL_HEADERS] + include_replace.replace = $$[QT_INSTALL_HEADERS/raw] lib_replace.match = $$QMAKE_LIBDIR_QT - lib_replace.replace = $$[QT_RAW_INSTALL_LIBS] + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] prefix_replace.match = $$QT_BUILD_TREE - prefix_replace.replace = $$[QT_RAW_INSTALL_PREFIX] + prefix_replace.replace = $$[QT_INSTALL_PREFIX/raw] QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace } unix { CONFIG += create_libtool explicitlib - QMAKE_PRL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] ### XXX + QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS/raw] ### XXX QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace - QMAKE_LIBTOOL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] + QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace } |