summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-09-23 12:35:06 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-09-23 12:45:24 (GMT)
commit0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b (patch)
tree6e42bb138fb9d1c6d69000f385905369f8ca6206 /bin
parentbbcef4e4b596324aeda80e0aa7d313c586454740 (diff)
downloadQt-0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b.zip
Qt-0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b.tar.gz
Qt-0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b.tar.bz2
Try to support Qt 4.4-style Phonon includes in Qt.
This introduces an undocumented "phonon_compat" subdir and also adds it to the INCLUDEPATH when QT += phonon is specified. With this, these styles of #includes should be supported: #include <Phonon> #include <Phonon/Phonon> #include <phonon> #include <phonon/phonon> #include <Phonon/MediaObject> #include <phonon/mediaobject.h> Still need to check if the headers get installed during "make install". I couldn't find where in our code that is done. BT: yes Reviewed-By: Trust Me
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt10
1 files changed, 8 insertions, 2 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 01c519e..5cb5d86 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -843,9 +843,15 @@ foreach (@modules_to_sync) {
$master_contents .= "#endif\n";
unless($showonly) {
- unless ($lib eq "phonon") {
+ my @master_includes;
+ if ($lib eq "phonon") {
+ push @master_includes, "$out_basedir/include/phonon_compat/phonon/phonon";
+ push @master_includes, "$out_basedir/include/phonon/Phonon/Phonon";
+ } else {
+ push @master_includes, "$out_basedir/include/$lib/$lib";
+ }
+ foreach my $master_include (@master_includes) {
#generate the "master" include file
- my $master_include = "$out_basedir/include/$lib/$lib";
$pri_install_files .= fixPaths($master_include, "$modules{$lib}") . " "; #get the master file installed too
if($master_include && -e "$master_include") {
open MASTERINCLUDE, "<$master_include";