From c168138195b623afc523ddd647dcfb690106c845 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Thu, 23 Dec 2010 15:07:21 +0100
Subject: Fixed several compile and deployment issues in the mmf phonon plugin.

RevBy:    Trust me

Conflicts:

	src/plugins/phonon/mmf/mmf.pro
	src/s60installs/s60installs.pro
---
 src/plugins/phonon/mmf/mmf.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index e546d83..9dccc4f 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -128,7 +128,7 @@ symbian {
         is_using_gnupoc {
             LIBS += -laudioequalizereffect -lbassboosteffect -ldistanceattenuationeffect -ldopplerbase -leffectbase -lenvironmentalreverbeffect -llistenerdopplereffect -llistenerlocationeffect -llistenerorientationeffect -llocationbase -lloudnesseffect -lorientationbase -lsourcedopplereffect -lsourcelocationeffect -lsourceorientationeffect -lstereowideningeffect
         } else {
-            LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerBase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect
+	    LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerbase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect
         }
 
 	# This is needed for having the .qtplugin file properly created on Symbian.
-- 
cgit v0.12


From 76c1492a51746730c1b51539b87f8d8c810f44ff Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Thu, 23 Dec 2010 15:52:38 +0100
Subject: Fixed a bug in elf2e32_qtwrapper regarding spaces in def files.

It would not parse the line correctly if a space was missing between
the "@" and the ordinal number.

RevBy:    Trust me
---
 bin/elf2e32_qtwrapper.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/elf2e32_qtwrapper.pl b/bin/elf2e32_qtwrapper.pl
index d91be14..a90877e 100755
--- a/bin/elf2e32_qtwrapper.pl
+++ b/bin/elf2e32_qtwrapper.pl
@@ -146,7 +146,7 @@ while (1) {
                     $origDefLine = <$origDefFile>;
                     if (defined($origDefLine)) {
                         $origDefLine =~ s/[\n\r]//;
-                        if ($origDefLine =~ /([a-z0-9_]+) +\@ ([0-9]+) (.*)/i) {
+                        if ($origDefLine =~ /([a-z0-9_]+) +\@ *([0-9]+) (.*)/i) {
                             $origSym = $1;
                             $origOrdinal = $2;
                             $origExtraData = $3;
@@ -161,7 +161,7 @@ while (1) {
             if ($savedNewDefFileLine) {
                 # This happens if the new def file was missing an entry.
                 $newDefLine = $savedNewDefFileLine;
-                $newDefLine =~ /([a-z0-9_]+) +\@ ([0-9]+) (.*)/i or die("$0: Shouldn't happen");
+                $newDefLine =~ /([a-z0-9_]+) +\@ *([0-9]+) (.*)/i or die("$0: Shouldn't happen");
                 $newSym = $1;
                 $newOrdinal = $2;
                 $newExtraData = $3;
@@ -171,7 +171,7 @@ while (1) {
                     $newDefLine = <$newDefFile>;
                     if (defined($newDefLine)) {
                         $newDefLine =~ s/[\n\r]//;
-                        if ($newDefLine =~ /([a-z0-9_]+) +\@ ([0-9]+) (.*)/i) {
+                        if ($newDefLine =~ /([a-z0-9_]+) +\@ *([0-9]+) (.*)/i) {
                             $newSym = $1;
                             $newOrdinal = $2;
                             $newExtraData = $3;
-- 
cgit v0.12