diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 04:25:07 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 04:25:07 (GMT) |
| commit | 94d62da58286df177286adcbe688c40629d2c551 (patch) | |
| tree | 773f3b055e77d1947cc4aba6f556630070017848 /src/qt_install.pri | |
| parent | 124f5714e8e6ec1945d536e622b51304f2b32dd7 (diff) | |
| parent | 0570b26f90f031b09970f8fca1a67339b66ee33f (diff) | |
| download | Qt-94d62da58286df177286adcbe688c40629d2c551.zip Qt-94d62da58286df177286adcbe688c40629d2c551.tar.gz Qt-94d62da58286df177286adcbe688c40629d2c551.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
Diffstat (limited to 'src/qt_install.pri')
| -rw-r--r-- | src/qt_install.pri | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/qt_install.pri b/src/qt_install.pri index 6dd2074..ebeac8d 100644 --- a/src/qt_install.pri +++ b/src/qt_install.pri @@ -15,11 +15,19 @@ qt_install_headers { $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH/arch } - flat_headers.files = $$INSTALL_HEADERS - flat_headers.path = $$[QT_INSTALL_HEADERS]/Qt - INSTALLS += flat_headers + equals(TARGET, phonon) { + class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/Phonon + } else { + flat_headers.files = $$INSTALL_HEADERS + flat_headers.path = $$[QT_INSTALL_HEADERS]/Qt + INSTALLS += flat_headers - targ_headers.files = $$INSTALL_HEADERS $$SYNCQT.HEADER_CLASSES + class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET + } + class_headers.files = $$SYNCQT.HEADER_CLASSES + INSTALLS += class_headers + + targ_headers.files = $$INSTALL_HEADERS targ_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET INSTALLS += targ_headers } |