Changeset 561 for trunk/bin

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• bin/createpackage.bat (copied) (copied from branches/vendor/nokia/qt/4.6.1/bin/createpackage.bat )
• bin/createpackage.pl (copied) (copied from branches/vendor/nokia/qt/4.6.1/bin/createpackage.pl )
• bin/patch_capabilities.pl (copied) (copied from branches/vendor/nokia/qt/4.6.1/bin/patch_capabilities.pl )
• bin/setcepaths.bat (copied) (copied from branches/vendor/nokia/qt/4.6.1/bin/setcepaths.bat )
• bin/syncqt (modified) (14 diffs)
• bin/syncqt.bat (modified) (1 diff)

trunk/bin/syncqt

@@ -2 +2 @@
 ######################################################################
 #
-# Synchronizes Qt header files - internal Trolltech tool.
+# Synchronizes Qt header files - internal  tool.
 #
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# Contact: Qt Software Information ([email protected])
+# Contact: ation ([email protected])
 #
 ######################################################################
@@ -25 +25 @@
         "QtGui" => "$basedir/src/gui",
         "QtOpenGL" => "$basedir/src/opengl",
+
         "QtCore" => "$basedir/src/corelib",
         "QtXml" => "$basedir/src/xml",
@@ -31 +32 @@
         "QtNetwork" => "$basedir/src/network",
         "QtSvg" => "$basedir/src/svg",
+
         "QtScript" => "$basedir/src/script",
         "QtScriptTools" => "$basedir/src/scripttools",
@@ -43 +45 @@
         "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore",
         "phonon" => "$basedir/src/phonon",
+
 );
 my %moduleheaders = ( # restrict the module headers to those found in relative path
@@ -309 +312 @@
     return copyFile($iheader, $header) if($copy);
 
-    my $iheader_no_basedir = $iheader;
-    $iheader_no_basedir =~ s,^$basedir/?,,;
     unless(-e "$header") {
         my $header_dir = dirname($header);
@@ -530 +531 @@
             ($dir =~ /\/$/) || ($dir .= "/");
         }
-        foreach $file ( readdir(D) ) {
+        foreach $file ( readdir(D) ) {
             next if ( $file  =~ /^\.\.?$/ );
             $p = $file;
@@ -666 +667 @@
     my $pri_install_classes = "";
     my $pri_install_files = "";
+
 
     my $libcapitals = $lib;
@@ -683 +685 @@
                         $master_contents .= "#include <QtNetwork/QtNetwork>\n" if("$_" eq "network");
                         $master_contents .= "#include <QtSvg/QtSvg>\n" if("$_" eq "svg");
+
                         $master_contents .= "#include <QtScript/QtScript>\n" if("$_" eq "script");
                         $master_contents .= "#include <QtScriptTools/QtScriptTools>\n" if("$_" eq "scripttools");
@@ -690 +693 @@
                         $master_contents .= "#include <QtXmlPatterns/QtXmlPatterns>\n" if("$_" eq "xmlpatterns");
                         $master_contents .= "#include <QtOpenGL/QtOpenGL>\n" if("$_" eq "opengl");
+
                     }
                 }
@@ -797 +801 @@
                                 my $header_base = basename($header);
                                 my $class = $_;
-                                if ($class =~ m/::/) {
-                                    $class =~ s,::,/,g;
-                                    $class = "../" . $class;
-                                }
+                                # 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", $header, 0));
+                                $header_copies++ if(syncHeader("$out_basedir/include/$lib/$class", , 0));
                             }
                         } else {
@@ -822 +827 @@
                                 foreach(@classes) {
                                     my $class = $_;
-                                    if ($class =~ m/::/) {
-                                        $class =~ s,::,/,g;
-                                        $class = "../" . $class;
-                                    }
+                                    # Strip namespaces:
+                                    $class =~ s/^.*:://;
+#                                   if ($class =~ m/::/) {
+#                                       $class =~ s,::,/,g;
+#                                   }
                                     my $class_header = fixPaths("$out_basedir/include/$lib/$class",
                                                                 $current_dir) . " ";
@@ -834 +840 @@
                             }
                         }
+
+
+
+
                     }
                     print "header created for $iheader ($header_copies)\n" if($header_copies > 0);
@@ -845 +855 @@
 
     unless($showonly) {
-        #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(-e "$master_include") {
-            open MASTERINCLUDE, "<$master_include";
-            local $/;
-            binmode MASTERINCLUDE;
-            my $oldmaster = <MASTERINCLUDE>;
-            close MASTERINCLUDE;
-            $oldmaster =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
-            $master_include = 0 if($oldmaster eq $master_contents);
-        }
-        if($master_include && $master_contents) {
-            my $master_dir = dirname($master_include);
-            mkpath $master_dir, 0777;
-            print "header (master) created for $lib\n";
-            open MASTERINCLUDE, ">$master_include";
-            print MASTERINCLUDE "$master_contents";
-            close MASTERINCLUDE;
+        my @master_includes;
+        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
+            if($master_include && -e "$master_include") {
+                open MASTERINCLUDE, "<$master_include";
+                local $/;
+                binmode MASTERINCLUDE;
+                my $oldmaster = <MASTERINCLUDE>;
+                close MASTERINCLUDE;
+                $oldmaster =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
+                $master_include = 0 if($oldmaster eq $master_contents);
+            }
+            if($master_include && $master_contents) {
+                my $master_dir = dirname($master_include);
+                mkpath $master_dir, 0777;
+                print "header (master) created for $lib\n";
+                open MASTERINCLUDE, ">$master_include";
+                print MASTERINCLUDE "$master_contents";
+                close MASTERINCLUDE;
+            }
         }
 
@@ -870 +883 @@
         $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
         $headers_pri_contents .= "SYNCQT.HEADER_CLASSES = $pri_install_classes\n";
+
         my $headers_pri_file = "$out_basedir/include/$lib/headers.pri";
         if(-e "$headers_pri_file") {

trunk/bin/syncqt.bat

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 @rem ***** This assumes PERL is in the PATH *****
 @perl.exe -S syncqt %*