From 0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 23 Sep 2009 14:35:06 +0200 Subject: 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 #include #include #include #include #include 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 --- bin/syncqt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'bin/syncqt') diff --git a/bin/syncqt b/bin/syncqt index 01c519e969..5cb5d8696c 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"; -- cgit v1.2.3