Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (506 commits)
  Removed timestamp setting and checking for Symbian header export
  Cocoa/Alien: bugfix corner cases with popups and enter/leave
  My 4.7.2 changes
  Fix QFileDialog Symbian native file dialog filename filtering.
  fix QMAKE_COPY_DIR for mingw+sh
  Phonon MMF backend enabled in configuration and deployment
  Using a better flag to control the fast allocator
  Using QElapesedTimer for Symbian idle detector
  Idle detector thread improvements
  Updated QtGui and QtCore DEF files
  Update tests for QScriptEngineAgent.
  PathView items were not correctly updated when rootIndex changed.
  Allow text to selected in a TextEdit or TextInput inside a Flickable.
  Update modules-related tests and docs
  CLeanup registers after AddString
  4.7.2 changes
  Change paging attributes for Symbian binaries
  Fix build failure
  Fix regression in creating mkspecs/default
  Use the thread-default glib context for the DBus connection in the ICD bearer manager.
  ...

4 files changed, 25 insertions, 50 deletions

diff --git a/config.profiles/symbian/bld.inf b/config.profiles/symbian/bld.inf
index d2d959b..ddb5157 100644
--- a/config.profiles/symbian/bld.inf
+++ b/config.profiles/symbian/bld.inf
@@ -78,5 +78,5 @@ translations/qt_zh_tw_symbian.ts /epoc32/include/platform/qt/translations/qt_zh_
 PRJ_EXTENSIONS
 START EXTENSION qt/qtconfig
 OPTION QT_ROOT ..
-OPTION OPTIONS -opensource -confirm-license -openvg -opengl-es-2 -script -no-scripttools -no-webkit -make make -graphicssystem openvg -no-phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools -audio-backend -fpu softvfp+vfpv2
+OPTION OPTIONS -opensource -confirm-license -openvg -opengl-es-2 -script -no-scripttools -no-webkit -make make -graphicssystem openvg -phonon -phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools -audio-backend -fpu softvfp+vfpv2
 END
\ No newline at end of file
diff --git a/config.profiles/symbian/headerexport b/config.profiles/symbian/headerexport
index e9e6f3b..d9f99e5 100644
--- a/config.profiles/symbian/headerexport
+++ b/config.profiles/symbian/headerexport
@@ -3,7 +3,7 @@
 #
 # Synchronizes Qt header files - internal development tool.
 #
-# Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 # Contact: Nokia Corporation (qt-info@nokia.com)
 #
 ######################################################################
@@ -315,17 +315,16 @@ sub classNames {
 }
 
 ######################################################################
-# Syntax:  syncHeader(header, iheader, copy, timestamp)
+# Syntax:  syncHeader(header, iheader, copy)
 # Params:  header, string, filename to create "symlink" for
 #          iheader, string, destination name of symlink
 #          copy, forces header to be a copy of iheader
-#          timestamp, the requested modification time if copying
 #
 # Purpose: Syncronizes header to iheader
 # Returns: 1 if successful, else 0.
 ######################################################################
 sub syncHeader {
-    my ($header, $iheader, $copy, $ts) = @_;
+    my ($header, $iheader, $copy) = @_;
     $iheader =~ s=\\=/=g;
     $header =~ s=\\=/=g;
     return copyFile($iheader, $header) if($copy);
@@ -339,7 +338,6 @@ sub syncHeader {
         open HEADER, ">$header" || die "Could not open $header for writing!\n";
         print HEADER "#include \"$iheader_out\"\n";
         close HEADER;
-        utime(time, $ts, $header) or die "$iheader, $header";
         return 1;
     }
     return 0;
@@ -453,48 +451,21 @@ sub fileCompare {
 sub copyFile
 {
     my ($file,$ifile, $copy,$knowdiff,$filecontents,$ifilecontents) = @_;
-    # Bi-directional synchronization
+
     open( I, "< " . $file ) || die "Could not open $file for reading";
     local $/;
     binmode I;
     $filecontents = <I>;
     close I;
-    if ( open(I, "< " . $ifile) ) {
-        local $/;
-        binmode I;
-        $ifilecontents = <I>;
-        close I;
-        $copy = fileCompare($file, $ifile);
-        $knowdiff = 0,
-    } else {
-        $copy = -1;
-        $knowdiff = 1;
-    }
 
-    if ( $knowdiff || ($filecontents ne $ifilecontents) ) {
-    if ( $copy > 0 && !$oneway) {
-            my $file_dir = dirname($file);
-            mkpath $file_dir, !$quiet unless(-e $file_dir);
-            open(O, "> " . $file) || die "Could not open $file for writing (no write permission?)";
-            local $/;
-            binmode O;
-            print O $ifilecontents;
-            close O;
-            utime time, (stat($ifile))[9], $file;
-            return 1;
-        } elsif ( $copy < 0 ) {
-            my $ifile_dir = dirname($ifile);
-            mkpath $ifile_dir, !$quiet unless(-e $ifile_dir);
-            open(O, "> " . $ifile) || die "Could not open $ifile for writing (no write permission?)";
-            local $/;
-            binmode O;
-            print O $filecontents;
-            close O;
-            utime time, (stat($file))[9], $ifile;
-            return 1;
-        }
-    }
-    return 0;
+    my $ifile_dir = dirname($ifile);
+    mkpath $ifile_dir, !$quiet unless(-e $ifile_dir);
+    open(O, "> " . $ifile) || die "Could not open $ifile for writing (no write permission?)";
+    local $/;
+    binmode O;
+    print O $filecontents;
+    close O;
+    return 1;
 }
 
 ######################################################################
@@ -848,7 +819,6 @@ foreach my $lib (@modules_to_sync) {
                             print "SYMBOL: $_\n";
                         }
                     } else {
-                        my $ts = (stat($iheader))[9];
                         #find out all the places it goes..
                         my @headers;
                         if ($public_header) {
@@ -887,18 +857,18 @@ foreach my $lib (@modules_to_sync) {
 #                                  class =~ s,::,/,g;
 #                               }
                                 $class_lib_map_contents .= "QT_CLASS_LIB($full_class, $lib, $header_base)\n";
-                                $header_copies++ if(syncHeader("$out_basedir/$out_subdir/$lib/$class", "$out_basedir/$out_subdir/$lib/$header", 0, $ts));
+                                $header_copies++ if(syncHeader("$out_basedir/$out_subdir/$lib/$class", "$out_basedir/$out_subdir/$lib/$header", 0));
 
                                 # KDE-Compat headers for Phonon
                                 if ($lib eq "phonon") {
-                                    $header_copies++ if (syncHeader("$out_basedir/$out_subdir/phonon_compat/Phonon/$class", "$out_basedir/$out_subdir/$lib/$header", 0, $ts));
+                                    $header_copies++ if (syncHeader("$out_basedir/$out_subdir/phonon_compat/Phonon/$class", "$out_basedir/$out_subdir/$lib/$header", 0));
                                 }
                             }
                         } elsif ($create_private_headers) {
                             @headers = ( "$out_basedir/$out_subdir/$lib/private/$header" );
                         }
                         foreach(@headers) { #sync them
-                            $header_copies++ if(syncHeader($_, $iheader, $copy_headers, $ts));
+                            $header_copies++ if(syncHeader($_, $iheader, $copy_headers));
                         }
 
                         if($public_header) {
@@ -1132,7 +1102,7 @@ if($check_includes) {
                     }
                 }
             }
-        }
     }
+}
 
 exit 0;
diff --git a/config.profiles/symbian/qt.iby b/config.profiles/symbian/qt.iby
index 2b3be0a..7431cfa 100644
--- a/config.profiles/symbian/qt.iby
+++ b/config.profiles/symbian/qt.iby
@@ -43,8 +43,8 @@ file=ABI_DIR\BUILD_DIR\qsvgicon.dll          SHARED_LIB_DIR\qsvgicon.dll
 // This is commented out by default, as normally Helix backend will be used.
 // If the Helix backend is present, it will override MMF backend, so make sure to remove it from
 // image creation in addition to uncommenting the following lines if you want to use MMF backend.
-//file=ABI_DIR\BUILD_DIR\phonon_mmf.dll        SHARED_LIB_DIR\phonon_mmf.dll
-//data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin
+file=ABI_DIR\BUILD_DIR\phonon_mmf.dll        SHARED_LIB_DIR\phonon_mmf.dll
+data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin
 
 // QtMultimedia audio backend
 file=ABI_DIR\BUILD_DIR\qaudio.dll            SHARED_LIB_DIR\qaudio.dll
diff --git a/config.profiles/symbian/qt.pkg b/config.profiles/symbian/qt.pkg
index 7bd1c59..6ef51ce 100644
--- a/config.profiles/symbian/qt.pkg
+++ b/config.profiles/symbian/qt.pkg
@@ -62,7 +62,12 @@
 "/epoc32/data/z/resource/qt/plugins/graphicssystems/qglgraphicssystem.qtplugin" - "!:\resource\qt\plugins\graphicssystems\qglgraphicssystem.qtplugin"
 "/epoc32/release/armv5/urel/qsvgicon.dll"    - "!:\sys\bin\qsvgicon.dll"
 "/epoc32/data/z/resource/qt/plugins/iconengines/qsvgicon.qtplugin"    - "!:\resource\qt\plugins\iconengines\qsvgicon.qtplugin"
-"/epoc32/data/z/resource/qt/plugins/bearer/qsymbianbearer.qtplugin" - "c:\resource\qt\plugins\bearer\qsymbianbearer.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/bearer/qsymbianbearer.qtplugin" - "!:\resource\qt\plugins\bearer\qsymbianbearer.qtplugin"
+
+; Phonon MMF plugin
+"/epoc32/release/armv5/urel/phonon_mmf.dll"    - "!:\sys\bin\phonon_mmf.dll"
+"/epoc32/data/z/resource/qt/plugins/phonon_backend/phonon_mmf.qtplugin" - "!:\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin"
+
 
 "/epoc32/release/armv5/urel/qts60plugin_5_0.dll" - "!:\sys\bin\qts60plugin_5_0.dll"