diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-06 11:32:25 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-01-13 09:33:34 (GMT) |
| commit | d1ece2b76abf64b7dff250551c5aeb3bbf5803e3 (patch) | |
| tree | 18fa7adc6d13a2333a4d8a0d2f31a7a3ecb50f3f | |
| parent | 3f077666ea4547580fa4568499e8ecf6174b392e (diff) | |
| download | Qt-d1ece2b76abf64b7dff250551c5aeb3bbf5803e3.zip Qt-d1ece2b76abf64b7dff250551c5aeb3bbf5803e3.tar.gz Qt-d1ece2b76abf64b7dff250551c5aeb3bbf5803e3.tar.bz2 | |
Remove special Phonon processing from syncqt.
Restore original Qt 4.4 behaviour. The capital P headers are not
correct because of frameworks on Mac.
More info, see thread:
http://lists.kde.org/?l=kde-multimedia&m=126045273702498&w=2
Task-number: QTBUG-4685
Reviewed-by: Trust Me
(cherry picked from commit 72adb8f5710fea385e94f9726546397cfbb1e4ad)
| -rwxr-xr-x | bin/syncqt | 23 | ||||
| -rw-r--r-- | mkspecs/features/qt.prf | 3 | ||||
| -rw-r--r-- | src/qt_install.pri | 2 |
3 files changed, 12 insertions, 16 deletions
@@ -800,9 +800,11 @@ foreach (@modules_to_sync) { foreach(@classes) { my $header_base = basename($header); my $class = $_; - if ($class =~ m/::/) { - $class =~ s,::,/,g; - } + # Strip namespaces: + $class =~ s/^.*:://; +# if ($class =~ m/::/) { +# class =~ s,::,/,g; +# } $class_lib_map_contents .= "QT_CLASS_LIB($_, $lib, $header_base)\n"; $header_copies++ if(syncHeader("$out_basedir/include/$lib/$class", "$out_basedir/include/$lib/$header", 0)); } @@ -824,9 +826,11 @@ foreach (@modules_to_sync) { my $pri_install_iheader = fixPaths($iheader, $current_dir); foreach(@classes) { my $class = $_; - if ($class =~ m/::/) { - $class =~ s,::,/,g; - } + # Strip namespaces: + $class =~ s/^.*:://; +# if ($class =~ m/::/) { +# $class =~ s,::,/,g; +# } my $class_header = fixPaths("$out_basedir/include/$lib/$class", $current_dir) . " "; $pri_install_classes .= $class_header @@ -851,12 +855,7 @@ foreach (@modules_to_sync) { unless($showonly) { 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"; - } + push @master_includes, "$out_basedir/include/$lib/$lib"; foreach my $master_include (@master_includes) { #generate the "master" include file $pri_install_files .= fixPaths($master_include, "$modules{$lib}") . " "; #get the master file installed too diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index af93f11..831f5b6 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -160,9 +160,6 @@ for(QTLIB, $$list($$lower($$unique(QT)))) { else:isEqual(QTLIB, dbus):qlib = QtDBus else:isEqual(QTLIB, phonon) { qlib = phonon - INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat/phonon - INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat - INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon/Phonon # The Helix backend requires this. Since we can't let a plugin set it, # we bump the values for all Symbian Phonon plugins. diff --git a/src/qt_install.pri b/src/qt_install.pri index 5b29942..f906e92 100644 --- a/src/qt_install.pri +++ b/src/qt_install.pri @@ -16,7 +16,7 @@ qt_install_headers { } equals(TARGET, phonon) { - class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/Phonon + class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET } else { flat_headers.files = $$INSTALL_HEADERS flat_headers.path = $$[QT_INSTALL_HEADERS]/Qt |