diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-20 10:34:13 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 12:38:32 +0200 |
commit | 6d9c545d2b83305c3c30a0e917e6c3a474dfe66a (patch) | |
tree | 54a003c6db32c85f80c5fbb46dbf9322855966e6 /mkspecs/features/qt_installs.prf | |
parent | 86f953a6d40666a3355e76b3ab2c8a2cf5452ec6 (diff) | |
parent | b652bffea7a0a1bf209c21d9b73f509226f031bd (diff) |
Merge "Merge branch 'buildsystem'" into refs/staging/master
Diffstat (limited to 'mkspecs/features/qt_installs.prf')
-rw-r--r-- | mkspecs/features/qt_installs.prf | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf index 45c0957a49..100ad59c66 100644 --- a/mkspecs/features/qt_installs.prf +++ b/mkspecs/features/qt_installs.prf @@ -1,18 +1,16 @@ -#always install the library -win32 { - dlltarget.path=$$[QT_INSTALL_BINS] - INSTALLS += dlltarget +#library +!qt_no_install_library { + win32 { + dlltarget.path = $$[QT_INSTALL_BINS] + INSTALLS += dlltarget + } + target.path = $$[QT_INSTALL_LIBS] + INSTALLS += target } -target.path=$$[QT_INSTALL_LIBS] -INSTALLS += target #headers qt_install_headers { INSTALL_HEADERS = $$SYNCQT.HEADER_FILES - equals(TARGET, QtCore) { - #headers created by configure - INSTALL_HEADERS *= $$QT_BUILD_TREE/src/corelib/global/qconfig.h - } equals(TARGET, phonon) { class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET @@ -39,3 +37,13 @@ qt_install_headers { INSTALLS += qpa_headers } +#module +qt_install_module { + !isEmpty(MODULE_PRI) { + pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules + pritarget.files = $$MODULE_PRI + INSTALLS += pritarget + } else { + warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") + } +} |