diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-12 14:27:54 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-23 11:58:15 +0200 |
| commit | 4b43263b870c17fd813d1d34f97146f4c725083e (patch) | |
| tree | ff728f87bf7d445e86d695de3b46e105c6aeb488 /src/qt_install.pri | |
| parent | d710a09bd26728a78963e6ad464540daea46f6a4 (diff) | |
Attempt to fix header installation for Phonon.
This is the long-standing issue of whether Phonon headers should be
written with a capital P or a lowercase one. KDE releases of Phonon
had <Phonon/CapitalClassName> whereas Qt 4.4 had <phonon/filename.h>.
I tried to solve this before by adding a Phonon subdir next to phonon
in include/, but that only compounded the error: the presence of two
dirs caused problems and the installation wasn't fixed.
So instead try to place Phonon/ClassName inside include/phonon. And
fix the installation to do it properly: just copy the include/$lib dir
into the target, then overwrite the .h files with the sources from
src/$lib.
Reviewed-by: Marius Storm-Olsen
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 6dd2074fcb..ebeac8d389 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 } |