Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (96 commits)
  Unbreak the Maemo 5 build after the Symbian fix
  QNAM HTTP: Fix problem with cached files and metaDataChanged()
  Add a testcase for QTBUG-11213 to prevent future regressions.
  Autotest: reenable the NTLM proxy test on tst_QTcpSocket
  Autotest: add a small, boring test for QAuthenticator
  Add documentation for the QAuthenticator options.
  Expose the QAuthenticator map of options in the API.
  Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader
  Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC"
  Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa
  Add unit tests for QMimeData.
  fix qconfig.h reference for shadow builds
  Drag and drop cursor doesnot change on invalid drop areas (Cocoa)
  Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa
  fix qconfig.h aliased header creation
  fix warning directive on gnuc
  qdoc: Removed navigation arrow that was causing display problems.
  Silence warning when building with MSVC 2005
  Fix an Assert in QTextTable
  Revert "Fix an Assert in QTextTable"
  ...

1 files changed, 5 insertions, 1 deletions

diff --git a/bin/syncqt b/bin/syncqt
index 11b1d72..03659d3 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -691,6 +691,7 @@ my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dis
 my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
 my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" );
 my %colliding_headers = ();
+my %inject_headers = ( "$basedir/src/corelib/global" => ( "*qconfig.h" ) );
 
 foreach (@modules_to_sync) {
     #iteration info
@@ -800,8 +801,10 @@ foreach (@modules_to_sync) {
         foreach (@subdirs) {
             my $subdir = "$_";
             my @headers = findFiles("$subdir", "^[-a-z0-9_]*\\.h\$" , 0);
+            push @headers, $inject_headers{$subdir} if (defined $inject_headers{$subdir});
             foreach (@headers) {
                 my $header = "$_";
+                my $shadow = ($header =~ s/^\*//);
                 $header = 0 if("$header" =~ /^ui_.*.h/);
                 foreach (@ignore_headers) {
                     $header = 0 if("$header" eq "$_");
@@ -819,6 +822,7 @@ foreach (@modules_to_sync) {
                     }
 
                     my $iheader = $subdir . "/" . $header;
+                    $iheader =~ s/^\Q$basedir\E/$out_basedir/ if ($shadow);
                     my @classes = $public_header ? classNames($iheader) : ();
                     if($showonly) {
                         print "$header [$lib]\n";
@@ -843,7 +847,7 @@ foreach (@modules_to_sync) {
                                     my $warning_msg = 'Inclusion of header files from include/Qt is deprecated.';
                                     $header_content = "#ifndef QT_NO_QT_INCLUDE_WARN\n" .
                                                       "    #if defined(__GNUC__)\n" .
-                                                      "        #pragma warning \"$warning_msg\"\n" .
+                                                      "        #warning \"$warning_msg\"\n" .
                                                       "    #elif defined(_MSC_VER)\n" .
                                                       "        #pragma message \"WARNING: $warning_msg\"\n" .
                                                       "    #endif\n".