Merge "Merge branch 'buildsystem'" into refs/staging/master

bin/qtmodule-configtests

@@ -57,7 +57,6 @@ use File::Path 'mkpath';
 use File::Spec::Functions qw/ :ALL /;
 use File::Temp qw/ :POSIX /;
 use Cwd;
-use Cwd 'abs_path';
 use Config;
 
 # Which file to look for the %configtests variable in
@@ -77,9 +76,8 @@ my $generator = $ARGV[3];
 
 our %configtests;
 
-my $absOutDir = abs_path($out_basedir);
+my $qmakeCachePath = catfile($out_basedir, '.qmake.cache');
-my $qmakeCachePath = catfile($absOutDir, '.qmake.cache');
+my $configLogPath = catfile($out_basedir, 'config.log');
-my $configLogPath = catfile($absOutDir, 'config.log');
 
 my $QMAKE = catfile($qtbasedir, "bin", ($^O =~ /win32/i) ? 'qmake.exe' : 'qmake');
 if (!-x $QMAKE) {
@@ -241,13 +239,13 @@ sub executeTest {
 
     my @QMAKEARGS = ('CONFIG-=debug_and_release', 'CONFIG-=app_bundle');
 
-    my $testOutDir = catdir($absOutDir, 'config.tests', $testName);
+    my $testOutDir = catdir($out_basedir, 'config.tests', $testName);
 
     # Since we might be cross compiling, look for barename (Linux) and .exe (Win32/Symbian)
     my $testOutFile1 = catfile($testOutDir, "$testName.exe");
     my $testOutFile2 = catfile($testOutDir, $testName);
 
-    if (abs_path($basedir) eq abs_path($out_basedir)) {
+    if ($basedir eq $out_basedir) {
         chdir $testOutDir or die "\nUnable to change to config test directory ($testOutDir): $!\n";
     } else { # shadow build
         if (! -e $testOutDir) {
@@ -315,7 +313,7 @@ loadConfigTests();
 # Only do this step for modules that have config tests
 # (qtbase doesn't). We try to preserve existing contents (and furthermore
 # only write to .qmake.cache if the tests change)
-if (abs_path($out_basedir) ne abs_path($qtbasedir)) {
+if ($out_basedir ne $qtbasedir) {
     # Read any existing content
     my $existingContents = fileContents($qmakeCachePath);
     my %oldTestResults;

bin/syncqt

@@ -47,6 +47,7 @@
 # use packages -------------------------------------------------------
 use File::Basename;
 use File::Path;
+use File::Spec;
 use Cwd;
 use Cwd 'abs_path';
 use Config;
@@ -82,16 +83,11 @@ our $quoted_basedir;
 # Make sure we use Windows line endings for chomp and friends on Windows.
 $INPUT_RECORD_SEPARATOR = "\r\n" if ($^O eq "msys");
 
-# try to figure out where QtBase is located
+my $qtbasedir = dirname(dirname($0));
-# normally the script location should be enough, if not fall back to
-# QTDIR environment variable. If that doesn't work, later ask the
-# user to use the -qtdir option explicitly.
-my $qtbasedir = $ENV{"QTDIR"};
-$qtbasedir = dirname(dirname($0)) if (!$qtbasedir);
 normalizePath(\$qtbasedir) if (defined $qtbasedir);
 
 # will be defined based on the modules sync.profile
-our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %mastercontent, %modulepris, %explicitheaders, %deprecatedheaders);
+our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %modulepris, %explicitheaders, %deprecatedheaders);
 
 # global variables (modified by options)
 my $isunix = 0;
@@ -106,10 +102,7 @@ my $copy_headers = 0;
 my $create_uic_class_map = 0;
 my $create_private_headers = 1;
 my $module_fwd = "";
-my $cache_module_fwd = 0;
 my $developer_build = 0;
-my $no_module_version_header = 0;
-my $makefile_generator = "";
 my @modules_to_sync ;
 $force_relative = 1 if ( -d "/System/Library/Frameworks" );
 
@@ -144,13 +137,8 @@ sub showUsage
     print "  -private              Force copy private headers         (default: " . ($create_private_headers ? "yes" : "no") . ")\n";
     print "  -module-fwd <PATH>    Create fwd includes for module pri files in the given\n";
     print "                        path (default: none)\n";
-    print "  -cache-module-fwd     Create a .qmake.cache file to cache the location of the\n";
-    print "                        fwd includes\n";
     print "  -developer-build      Point libraries and binaries to a common directory for\n";
     print "                        easy development\n";
-    print "  -no-module-version-header\n";
-    print "                        Don't create module version header file\n";
-    print "  -generator <PATH>     Specify the makefile generator setting (e.g. 'UNIX')\n";
     print "  -help                 This help\n";
     exit 0;
 }
@@ -188,30 +176,6 @@ sub checkRelative {
     return 1;
 }
 
-######################################################################
-# Syntax:  shouldMasterInclude(iheader)
-# Params:  iheader, string, filename to verify inclusion
-#
-# Purpose: Determines if header should be in the master include file.
-# Returns: 0 if file contains "#pragma qt_no_master_include" or not
-#          able to open, else 1.
-######################################################################
-sub shouldMasterInclude {
-    my ($iheader) = @_;
-    return 0 if(basename($iheader) =~ /_/);
-    return 0 if(basename($iheader) =~ /qconfig/);
-    if(open(F, "<$iheader")) {
-        while(<F>) {
-            chomp;
-            return 0 if(/^\#pragma qt_no_master_include$/);
-        }
-        close(F);
-    } else {
-        return 0;
-    }
-    return 1;
-}
-
 ######################################################################
 # Syntax:  classNames(iheader)
 # Params:  iheader, string, filename to parse for classname "symlinks"
@@ -391,50 +355,20 @@ sub syncHeader {
 # Purpose: file is made relative (if possible) of dir.
 # Returns: String with the above applied conversion.
 ######################################################################
+
+sub cleanupPath {
+    my ($file) = @_;
+    normalizePath(\$file);
+    while ($file =~ s,/[^/]+/\.\./,/,) {}
+    return $file;
+}
+
 sub fixPaths {
     my ($file, $dir) = @_;
-    normalizePath(\$file);
-    normalizePath(\$dir);
 
-    #setup
+    my $out = File::Spec->abs2rel(cleanupPath($file), cleanupPath($dir));
-    my $ret = $file;
+    $out =~ s,\\,/,g;
-    $ret =~ s,/cygdrive/([a-zA-Z])/,$1:/,g;
+    return $out;
-    my $file_dir = dirname($file);
-    if($file_dir eq ".") {
-        $file_dir = getcwd();
-        normalizePath(\$file_dir);
-    }
-    $file_dir =~ s,/cygdrive/([a-zA-Z])/,$1:/,g;
-    if($dir eq ".") {
-        $dir = getcwd();
-        normalizePath(\$dir);
-    }
-    $dir =~ s,/cygdrive/([a-zA-Z])/,$1:/,g;
-    return basename($file) if($file_dir eq $dir);
-
-    #guts
-    while ($file_dir =~ s,/[^/]+/\.\./,/,) {}
-    while ($dir =~ s,/[^/]+/\.\./,/,) {}
-    my $match_dir = 0;
-    for(my $i = 1; $i < length($file_dir); $i++) {
-        my $slash = index($file_dir, "/", $i);
-        last if($slash == -1);
-        my $tmp = substr($file_dir, 0, $slash);
-        last unless($dir =~ m,^\Q$tmp\E/,);
-        $match_dir = $tmp;
-        $i = $slash;
-    }
-    if($match_dir) {
-        my $after = substr($dir, length($match_dir));
-        my $count = ($after =~ tr,/,,);
-        my $dots = "";
-        for(my $i = 0; $i < $count; $i++) {
-            $dots .= "../";
-        }
-        $ret =~ s,^\Q$match_dir\E,$dots,;
-    }
-    $ret =~ s,/+,/,g;
-    return $ret;
 }
 
 ######################################################################
@@ -625,6 +559,18 @@ sub loadSyncProfile {
     return $result;
 }
 
+sub basePrettify {
+    my ($arg) = @_;
+    $$arg =~ s,^\Q$basedir\E,<srcbase>,;
+    $$arg =~ s,^\Q$out_basedir\E,<outbase>,;
+}
+
+sub cleanPath {
+    my ($arg) = @_;
+    while ($arg =~ s,[^/]+/\.\.(/|$),,) {}
+    return $arg;
+}
+
 sub locateSyncProfile
 {
     my ($directory) = @_;
@@ -672,15 +618,9 @@ while ( @ARGV ) {
     } elsif($arg eq "-module-fwd") {
         $var = "module_fwd";
         $val = shift @ARGV;
-    } elsif($arg eq "-cache-module-fwd") {
-        $var = "cache_module_fwd";
-        $val = "yes";
     } elsif($arg eq "-developer-build") {
         $var = "developer_build";
         $val = "yes";
-    } elsif($arg eq "-no-module-version-header") {
-        $var = "no_module_version_header";
-        $val = "yes";
     } elsif($arg =~ /^-no-(.*)$/) {
         $var = $1;
         $val = "no";
@@ -712,9 +652,6 @@ while ( @ARGV ) {
     } elsif($arg eq "-qtdir") {
         $var = "qtdir";
         $val = shift @ARGV;
-    } elsif($arg eq "-generator") {
-        $var = "makefile_generator";
-        $val = shift @ARGV;
     } elsif($arg =~/^-/) {
         print "Unknown option: $arg\n\n" if(!$var);
         showUsage();
@@ -794,14 +731,8 @@ while ( @ARGV ) {
         }
     } elsif ($var eq "module_fwd") {
         $module_fwd = $val;
-    } elsif ($var eq "cache_module_fwd") {
-        $cache_module_fwd = 1;
     } elsif ($var eq "developer_build") {
         $developer_build = 1;
-    } elsif ($var eq "makefile_generator") {
-            $makefile_generator = $val;
-    } elsif ($var eq "no_module_version_header") {
-            $no_module_version_header = 1;
     } elsif ($var eq "output") {
         my $outdir = $val;
         if(checkRelative($outdir)) {
@@ -830,8 +761,7 @@ our @ignore_for_include_check = ();
 our @ignore_for_qt_begin_header_check = ();
 our @ignore_for_qt_begin_namespace_check = ();
 our @ignore_for_qt_module_check = ();
-my %colliding_headers = ();
+our %inject_headers = ();
-my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir
 
 # load the module's sync.profile here, before we can
 loadSyncProfile(\$basedir, \$out_basedir);
@@ -842,15 +772,24 @@ my %allmoduleheadersprivate = map { $_ => 1 } @allmoduleheadersprivate;
 
 $isunix = checkUnix; #cache checkUnix
 
+my $qt_version = fileContents($qtbasedir."/mkspecs/qconfig.pri");
+if (length($qt_version)) {
+    $qt_version =~ s,.*^QT_VERSION\h*=\h*(\S+).*,$1,sm;
+} else {
+    $qt_version = fileContents($basedir."/src/corelib/global/qglobal.h");
+    $qt_version =~ s,.*^#\h*define\h+QT_VERSION_STR\h+"([^"]+)".*,$1,sm;
+}
 foreach my $lib (@modules_to_sync) {
     #iteration info
     my $dir = $modules{$lib};
-    my $module_version = "";
-    my $module_major_version = 0;
-    my $module_minor_version = 0;
-    my $module_patch_version = 0;
 
-    if (-e "$modulepris{$lib}") {
+    my $project = $dir;
+    $project =~ s,/([^/]+)$,/$1/$1.pro,;
+    my $module_version = fileContents($project);
+    $module_version = $qt_version unless ($module_version =~ s,.*^VERSION\h*=\h*(\S+).*,$1,sm);
+
+    # Backwards compatibility for modules with checked in .pri files.
+    if (defined $modulepris{$lib} and -e "$modulepris{$lib}") {
         my $content = fileContents($modulepris{$lib});
         my @version_rows = grep(/QT\..*\.VERSION/, split('\n', $content));
         if(@version_rows) {
@@ -859,16 +798,8 @@ foreach my $lib (@modules_to_sync) {
             chomp $module_version;
             $module_version =~ s/^\s*QT\..*\.VERSION\s*=\s*([^#]+).*$/$1/;
             $module_version =~ s/\s+$//;
-            my @versions = split(/\./, $module_version);
-            $module_major_version = int($versions[0]);
-            chomp $module_major_version;
-            $module_minor_version = int($versions[1]);
-            chomp $module_minor_version;
-            $module_patch_version = int($versions[2]);
-            chomp $module_patch_version;
         }
     }
-    print "$lib: WARNING: Module\'s pri missing QT.<module>.VERSION variable! Private headers not versioned!\n" if (!$module_version);
 
     my $pathtoheaders = "";
     $pathtoheaders = $moduleheaders{$lib} if ($moduleheaders{$lib});
@@ -882,29 +813,20 @@ foreach my $lib (@modules_to_sync) {
     my $pri_install_pfiles = "";
     my $pri_install_qpafiles = "";
 
-    my $libcapitals = $lib;
+    push @{$inject_headers{$dir}}, lc($lib)."version.h";
-    $libcapitals =~ y/a-z/A-Z/;
+    $classnames{lc($lib)."version.h"} = $lib."Version";
-    my $master_contents = "#ifndef QT_".$libcapitals."_MODULE_H\n#define QT_".$libcapitals."_MODULE_H\n";
-
-    #get dependencies
-    if(-e "$dir/" . basename($dir) . ".pro") {
-        if(open(F, "<$dir/" . basename($dir) . ".pro")) {
-            while(my $line = <F>) {
-                chomp $line;
-                if($line =~ /^ *QT *\+?= *([^\r\n]*)/) {
-                    foreach(split(/ /, $1)) {
-                        $_ =~ s/-private$//;
-                        my $content = $mastercontent{$_};
-                        $master_contents .= $content if ($content);
-                    }
-                }
-            }
-            close(F);
-        }
-    }
 
     #remove the old files
     if($remove_stale) {
+        my %injections = ();
+        for my $p (keys %inject_headers) {
+            next unless ($p =~ /^\Q$dir\E(\/|$)/);
+            my $sp = $p;
+            $sp =~ s,^\Q$basedir\E/,$out_basedir/,;
+            for my $n (@{$inject_headers{$p}}) {
+                $injections{$sp."/".$n} = 1;
+            }
+        }
         my @subdirs = ("$out_basedir/include/$lib");
         foreach my $subdir (@subdirs) {
             if (opendir DIR, $subdir) {
@@ -923,7 +845,7 @@ foreach my $lib (@modules_to_sync) {
                                     if($line =~ /^\#include \"([^\"]*)\"$/) {
                                         my $include = $1;
                                         $include = $subdir . "/" . $include unless(substr($include, 0, 1) eq "/");
-                                        $remove_file = 1 unless(-e $include);
+                                        $remove_file = 1 unless(-e $include or defined $injections{cleanPath($include)});
                                     } else {
                                         $remove_file = 0;
                                         last;
@@ -941,32 +863,6 @@ foreach my $lib (@modules_to_sync) {
         }
     }
 
-    # create the version header files for each module
-    unless ($no_module_version_header) {
-        my $modulepri = $modulepris{$lib};
-        if (-e $modulepri) {
-            my $modulepriname = basename($modulepri);
-            # FIXME: this creates a file in the source location for shadow-builds
-            my $moduleversionheader = "$modules{$lib}/" . lc($lib) . "version.h";
-            my $modulehexstring = sprintf("0x%02X%02X%02X", $module_major_version, $module_minor_version, $module_patch_version);
-            open MODULE_VERSION_HEADER_FILE, ">$moduleversionheader" or die "Can't open $moduleversionheader for writing";
-            print MODULE_VERSION_HEADER_FILE "/* This file was generated by syncqt with the info from sync.profile. */\n";
-            print MODULE_VERSION_HEADER_FILE "#ifndef QT_". uc($lib) . "_VERSION_H\n";
-            print MODULE_VERSION_HEADER_FILE "#define QT_". uc($lib) . "_VERSION_H\n";
-            print MODULE_VERSION_HEADER_FILE "\n";
-            print MODULE_VERSION_HEADER_FILE "#define " .uc($lib) . "_VERSION_STR \"" . $module_version . "\"\n";
-            print MODULE_VERSION_HEADER_FILE "\n";
-            print MODULE_VERSION_HEADER_FILE "#define " .uc($lib) . "_VERSION $modulehexstring\n", ;
-            print MODULE_VERSION_HEADER_FILE "\n";
-            print MODULE_VERSION_HEADER_FILE "#endif // QT_". uc($lib) . "_VERSION_H\n";
-            close MODULE_VERSION_HEADER_FILE;
-            $moduleversionheader = "<srcbase>" . substr($moduleversionheader, length($basedir)) if ($verbose_level < 2);
-            print "$lib: created version header $moduleversionheader\n" if($verbose_level);
-        } elsif ($modulepri) {
-            print "$lib: WARNING: Module\'s pri file '$modulepri' not found.\n$lib: Skipped creating module version header.\n";
-        }
-    }
-
     #create the new ones
     foreach my $current_dir (split(/;/, $dir)) {
         my @headers_paths = split(/;/, $pathtoheaders);
@@ -997,7 +893,7 @@ foreach my $lib (@modules_to_sync) {
             foreach my $subdir (@subdirs) {
                 my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);
                 if (defined $inject_headers{$subdir}) {
-                    foreach my $if ($inject_headers{$subdir}) {
+                    foreach my $if (@{$inject_headers{$subdir}}) {
                         @headers = grep(!/^\Q$if\E$/, @headers); #in case we configure'd previously
                         push @headers, "*".$if;
                     }
@@ -1066,17 +962,9 @@ foreach my $lib (@modules_to_sync) {
                                 }
 
                             } elsif ($create_private_headers && !$qpa_header) {
-                                if ($module_version) {
+                                @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" );
-                                    @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" );
-                                } else {
-                                    @headers = ( "$out_basedir/include/$lib/private/$header" );
-                                }
                             } elsif ($create_private_headers) {
-                                if ($module_version) {
+                                @headers = ( "$out_basedir/include/$lib/$module_version/$lib/qpa/$header" );
-                                    @headers = ( "$out_basedir/include/$lib/$module_version/$lib/qpa/$header" );
-                                } else {
-                                    @headers = ( "$out_basedir/include/$lib/qpa/$header" );
-                                }
                             }
 
                             foreach(@headers) { #sync them
@@ -1084,9 +972,6 @@ foreach my $lib (@modules_to_sync) {
                             }
 
                             if($public_header) {
-                                #put it into the master file
-                                $master_contents .= "#include \"$public_header\"\n" if(shouldMasterInclude($iheader));
-
                                 #deal with the install directives
                                 if($public_header) {
                                     my $pri_install_iheader = fixPaths($iheader, $current_dir);
@@ -1120,7 +1005,7 @@ foreach my $lib (@modules_to_sync) {
 
                         if ($verbose_level && $header_copies) {
                             my $new_header_dirname = dirname($iheader);
-                            $new_header_dirname = "<srcbase>" . substr($new_header_dirname, length($basedir)) if ($new_header_dirname && $verbose_level < 2);
+                            basePrettify(\$new_header_dirname) if ($new_header_dirname && $verbose_level < 2);
                             my $header_base = basename($iheader);
                             if ($verbose_level < 3) {
                                 my $line_prefix = ",";
@@ -1133,7 +1018,7 @@ foreach my $lib (@modules_to_sync) {
                                 }
                                 print "$line_prefix $header_base ($header_copies)";
                             } else { # $verbose_level >= 3
-                                $iheader = "<srcbase>" . substr($iheader, length($basedir)) if ($verbose_level == 3);
+                                basePrettify(\$iheader) if ($verbose_level == 3);
                                 print "$lib: created $header_copies fwd-include headers for $iheader\n";
                             }
                         }
@@ -1144,9 +1029,6 @@ foreach my $lib (@modules_to_sync) {
         }
     }
 
-    # close the master include:
-    $master_contents .= "#endif\n";
-
     unless($showonly) {
         # create deprecated headers
         my $first = 1;
@@ -1157,11 +1039,7 @@ foreach my $lib (@modules_to_sync) {
 
             my $header_path = "$out_basedir/include/$lib/";
             unless ($public_header) {
-                if ($module_version) {
+                $header_path .= "$module_version/$lib/private/";
-                    $header_path .= "$module_version/$lib/private/";
-                } else {
-                    $header_path .= "private/";
-                }
             }
             $header_path .= "$header";
 
@@ -1213,30 +1091,9 @@ foreach my $lib (@modules_to_sync) {
             print " }\n" unless ($first);
         }
 
-        my @master_includes;
+        # KDE-Compat master header for Phonon
-        push @master_includes, "$out_basedir/include/$lib/$lib";
+        if ($lib eq "phonon") {
-        push @master_includes, "$out_basedir/include/phonon_compat/Phonon/Phonon" if ($lib eq "phonon");
+            syncHeader($lib, "$out_basedir/include/phonon_compat/Phonon/Phonon", "$out_basedir/include/phonon/phonon", 0);
-        foreach my $master_include (@master_includes) {
-            #generate the "master" include file
-            my @tmp = split(/;/,$modules{$lib});
-            $pri_install_files .= fixPaths($master_include, $tmp[0]) . " "; #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);
-                make_path($master_dir, $lib, $verbose_level);
-                open MASTERINCLUDE, ">$master_include";
-                print MASTERINCLUDE $master_contents;
-                close MASTERINCLUDE;
-                print "$lib: created header (master) file\n" if($verbose_level);
-            }
         }
 
         #handle the headers.pri for each module
@@ -1255,7 +1112,7 @@ foreach my $lib (@modules_to_sync) {
             $old_headers_pri_contents =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
             $headers_pri_file = 0 if($old_headers_pri_contents eq $headers_pri_contents);
         }
-        if($headers_pri_file && $master_contents) {
+        if($headers_pri_file) {
             my $headers_pri_dir = dirname($headers_pri_file);
             make_path($headers_pri_dir, $lib, $verbose_level);
             open HEADERS_PRI_FILE, ">$headers_pri_file";
@@ -1267,7 +1124,7 @@ foreach my $lib (@modules_to_sync) {
         # create forwarding module pri in qtbase/mkspecs/modules
         if ($module_fwd) {
             my $modulepri = $modulepris{$lib};
-            if (-e $modulepri) {
+            if (defined $modulepri and -e $modulepri) {
                 my $modulepriname = basename($modulepri);
                 make_path($module_fwd, $lib, $verbose_level);
                 my $moduleprifwd = "$module_fwd/$modulepriname";
@@ -1283,17 +1140,6 @@ foreach my $lib (@modules_to_sync) {
                 print MODULE_PRI_FILE "include($modulepri)\n";
                 close MODULE_PRI_FILE;
                 utime(time, (stat($modulepri))[9], $moduleprifwd);
-                if ($cache_module_fwd) {
-                    my $cacheStatement = "QMAKE_EXTRA_MODULE_FORWARDS = \"$module_fwd\"";
-                    my $cacheFile = "$out_basedir/.qmake.cache";
-                    my $existingQmakeCache = fileContents($cacheFile);
-                    # Skip if it's already there.
-                    if ($existingQmakeCache !~ $cacheStatement) {
-                        open QMAKE_CACHE_FILE, ">>$cacheFile" or die("Could not open $cacheFile for writing");
-                        print QMAKE_CACHE_FILE "$cacheStatement\n";
-                        close(QMAKE_CACHE_FILE);
-                    }
-                }
             } elsif ($modulepri) {
                 print "$lib: WARNING: Module\'s pri file '$modulepri' not found.\n$lib: Skipped creating forwarding pri.\n";
             }
@@ -1441,21 +1287,4 @@ if($check_includes) {
     }
 }
 
-# Do configure tests now (pass some things along)
-# fatal tests have a non zero return
-# If the generator is not set (e.g. someone invoking syncqt as part of configure etc, then don't run tests either)
-unless ($showonly || $makefile_generator eq '') {
-    my $configtests = dirname($0)."/qtmodule-configtests";
-    if (! -f $configtests) {
-        $configtests = $qtbasedir."/bin/qtmodule-configtests";
-    }
-    if (! -f $configtests) {
-        warn "Unable to locate qtmodule-configtests script - config tests disabled.\n";
-    } else {
-        if (system($EXECUTABLE_NAME, $configtests, $basedir, $out_basedir, $qtbasedir, $makefile_generator)) {
-            die "$configtests exited with status $?";
-        }
-    }
-}
-
 exit 0;

configure

@@ -919,19 +919,8 @@ while [ "$#" -gt 0 ]; do
         VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"`
         VAL=no
         ;;
-    #Qt style yes options
-    -profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-eglfs|-directfb|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-qml-debug|-javascript-jit|-rpath|-pkg-config|-force-pkg-config|-icu|-force-asserts|-testcocoon|-c++11)
-        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
-        VAL=yes
-        ;;
     #Qt style options that pass an argument
-    -qconfig)
+    -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig)
-        CFG_QCONFIG="$VAL"
-        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
-        shift
-        VAL=$1
-        ;;
-    -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         shift
         VAL="$1"
@@ -1068,9 +1057,10 @@ while [ "$#" -gt 0 ]; do
         VAR="add_warn"
         VAL="$1"
         ;;
+    #General options, including Qt style yes options
     -*)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
-        VAL="unknown"
+        VAL="yes"
         ;;
     *)
         UNKNOWN_ARG=yes
@@ -3491,8 +3481,9 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
     mv -f "$QMAKE_QCONFIG_H" "$QCONFIG_H"
 
     #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured
-    rm -rf mkspecs/default
+    rm -rf mkspecs/default mkspecs/default-host
     ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
+    ln -s `echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default-host
     mkdir -p "$outpath/qmake" || exit
     # fix makefiles
     for mkfile in GNUmakefile Makefile; do
@@ -3606,6 +3597,16 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
     [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
 fi # Build qmake
 
+#-------------------------------------------------------------------------------
+# create a qt.conf for the Qt build tree itself
+#-------------------------------------------------------------------------------
+
+QTCONFFILE="$outpath/bin/qt.conf"
+cat > "$QTCONFFILE" <<EOF
+[EffectivePaths]
+Prefix=..
+EOF
+
 #-------------------------------------------------------------------------------
 # Detect pkg-config
 #-------------------------------------------------------------------------------
@@ -5895,10 +5896,6 @@ QT_SOURCE_TREE = \$\$quote($relpath)
 QT_BUILD_TREE = \$\$quote($outpath)
 QT_BUILD_PARTS = $CFG_BUILD_PARTS
 
-#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
-QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
-QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
-
 include(\$\$PWD/mkspecs/qmodule.pri)
 CONFIG += dylib depend_includepath fix_output_dirs no_private_qt_headers_warning QTDIR_build
 
@@ -5906,9 +5903,14 @@ EOF
 
 #dump the qmake spec
 if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then
-   echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp"
+   echo "XQMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp"
 else
-   echo "QMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp"
+   echo "XQMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp"
+fi
+if [ -d "$outpath/mkspecs/$PLATFORM" ]; then
+   echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$PLATFORM" >> "$CACHEFILE.tmp"
+else
+   echo "QMAKESPEC = $PLATFORM" >> "$CACHEFILE.tmp"
 fi
 
 # replace .qmake.cache if it differs from the newly created temp file
@@ -6119,231 +6121,48 @@ EXEC=""
 # build makefiles based on the configuration
 #-------------------------------------------------------------------------------
 
-echo "Finding project files. Please wait..."
 if [ "$CFG_NOPROCESS" != "yes" ]; then
-    "$outpath/bin/qmake" -prl -r "${relpath}/qtbase.pro"
+    echo "Creating makefiles. Please wait..."
-    if [ -f "${relpath}/qtbase.pro" ]; then
+    "$outpath/bin/qmake" -r ${OPT_FAST+CONFIG+=fast} "$relpath"
-        mkfile="${outpath}/Makefile"
+    echo "Done"
-        [ -f "$mkfile" ] && chmod +w "$mkfile"
-        QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/qtbase.pro" -o "$mkfile"
-    fi
-fi
 
-# .projects      -> projects to process
+    if [ "$OPT_FAST" = "yes" ]; then
-# .projects.1    -> qt and moc
+        PART_ROOTS=
-# .projects.2    -> subdirs and libs
+        for part in $CFG_BUILD_PARTS; do
-# .projects.3    -> the rest
+            case "$part" in
-rm -f .projects .projects.1 .projects.2 .projects.3
+            examples|tests) PART_ROOTS="$PART_ROOTS $part" ;;
+            esac
+        done
+        if [ "x$PART_ROOTS" != "x" ]; then
+            echo
+            echo "Creating stub makefiles. Please wait..."
+            QMAKE="$outpath/bin/qmake"
+            [ "$CFG_DEBUG_RELEASE" = "no" ] && first_tgt="first_target: first" || first_tgt=
+            (cd "$relpath" && find $PART_ROOTS -name '*.pro') | grep -v /testdata/ | while read p; do
+                d=${p%/*}
+                test -f "$outpath/$d/Makefile" && continue
+                echo "  for $relpath/$p"
 
-QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'`
+                mkdir -p "$outpath/$d" || exit
-if [ -z "$AWK" ]; then
+                cat > "$outpath/$d/Makefile" <<EOF || exit
-    for p in `echo $QMAKE_PROJECTS`; do
+# $outpath/$d/Makefile: generated by configure
-        echo "$p" >> .projects
-    done
-else
-    cat >projects.awk <<EOF
-BEGIN {
-    files = 0
-    target_file = ""
-    input_file = ""
-
-    first = "./.projects.1.tmp"
-    second = "./.projects.2.tmp"
-    third = "./.projects.3.tmp"
-}
-
-FNR == 1 {
-    if ( input_file ) {
-        if ( ! target_file )
-            target_file = third
-        print input_file >target_file
-    }
-
-    matched_target = 0
-    template_lib = 0
-    input_file = FILENAME
-    target_file = ""
-}
-
-/^(TARGET.*=)/ {
-    if ( \$3 == "moc" || \$3 ~ /^Qt/ ) {
-        target_file = first
-        matched_target = 1
-    } else if ( \$3 == "lrelease" || \$3 == "qm_phony_target" ) {
-        target_file = second
-        matched_target = 1
-    }
-}
-
-matched_target == 0 && /^(TEMPLATE.*=)/ {
-    if ( \$3 == "subdirs" )
-        target_file = second
-    else if ( \$3 == "lib" )
-        template_lib = 1
-    else
-        target_file = third
-}
-
-matched_target == 0 && template_lib == 1 && /^(CONFIG.*=)/ {
-    if ( \$0 ~ /plugin/ )
-        target_file = third
-    else
-        target_file = second
-}
-
-END {
-    if ( input_file ) {
-        if ( ! target_file )
-            target_file = third
-        print input_file >>target_file
-    }
-}
-
-EOF
-
-    rm -f .projects.all
-    for p in `echo $QMAKE_PROJECTS`; do
-       echo "$p" >> .projects.all
-    done
-
-    # if you get errors about the length of the command line to awk, change the -l arg
-    # to split below
-    split -l 100 .projects.all .projects.all.
-    for p in .projects.all.*; do
-       "$AWK" -f projects.awk `cat $p`
-       [ -f .projects.1.tmp ] && cat .projects.1.tmp >> .projects.1
-       [ -f .projects.2.tmp ] && cat .projects.2.tmp >> .projects.2
-       [ -f .projects.3.tmp ] && cat .projects.3.tmp >> .projects.3
-       rm -f .projects.1.tmp .projects.2.tmp .projects.3.tmp $p
-    done
-    rm -f .projects.all* projects.awk
-
-    [ -f .projects.1 ] && cat .projects.1 >>.projects
-    [ -f .projects.2 ] && cat .projects.2 >>.projects
-    rm -f .projects.1 .projects.2
-    if [ -f .projects.3 ] && [ "$OPT_FAST" = "no" ]; then
-       cat .projects.3 >>.projects
-       rm -f .projects.3
-    fi
-fi
-# don't sort Qt and MOC in with the other project files
-# also work around a segfaulting uniq(1)
-if [ -f .sorted.projects.2 ]; then
-    sort .sorted.projects.2 > .sorted.projects.2.new
-    mv -f .sorted.projects.2.new .sorted.projects.2
-    cat .sorted.projects.2 >> .sorted.projects.1
-fi
-[ -f .sorted.projects.1 ] && sort .sorted.projects.1 >> .sorted.projects
-rm -f .sorted.projects.2 .sorted.projects.1
-
-NORM_PROJECTS=0
-FAST_PROJECTS=0
-if [ -f .projects ]; then
-   uniq .projects >.tmp
-   mv -f .tmp .projects
-   NORM_PROJECTS=`cat .projects | wc -l | sed -e "s, ,,g"`
-fi
-if [ -f .projects.3 ]; then
-   uniq .projects.3 >.tmp
-   mv -f .tmp .projects.3
-   FAST_PROJECTS=`cat .projects.3 | wc -l | sed -e "s, ,,g"`
-fi
-echo "  `expr $NORM_PROJECTS + $FAST_PROJECTS` projects found."
-echo
-
-PART_ROOTS=
-for part in $CFG_BUILD_PARTS; do
-    case "$part" in
-    tools) PART_ROOTS="$PART_ROOTS tools" ;;
-    libs) PART_ROOTS="$PART_ROOTS src" ;;
-    translations) PART_ROOTS="$PART_ROOTS translations" ;;
-    examples) PART_ROOTS="$PART_ROOTS examples" ;;
-    *) ;;
-    esac
-done
-
-if [ "$CFG_DEV" = "yes" ]; then
-    PART_ROOTS="$PART_ROOTS tests"
-fi
-
-echo "Creating makefiles. Please wait..."
-for file in .projects .projects.3; do
-    [ '!' -f "$file" ] && continue
-    for a in `cat $file`; do
-        IN_ROOT=no
-	for r in $PART_ROOTS; do
-	    if echo "$a" | grep "^$r" >/dev/null 2>&1 || echo "$a" | grep "^$relpath/$r" >/dev/null 2>&1; then
-		IN_ROOT=yes
-		break
-            fi
-	done
-        [ "$IN_ROOT" = "no" ] && continue
-
-        case $a in
-        *winmain/winmain.pro)
-            if [ "$CFG_NOPROCESS" = "yes" ] || [ "$XPLATFORM_MINGW" != "yes" ]; then
-                continue
-            fi
-            SPEC=$XQMAKESPEC ;;
-        */qmake/qmake.pro) continue ;;
-        *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*tools/qdoc*|*tools/qdbusxml2cpp*|*tools/qdbuscpp2xml*) SPEC=$QMAKESPEC ;;
-        *) if [ "$CFG_NOPROCESS" = "yes" ]; then
-              continue
-           else
-              SPEC=$XQMAKESPEC
-           fi;;
-        esac
-        dir=`dirname "$a" | sed -e "s;$sepath;.;g"`
-        test -d "$dir" || mkdir -p "$dir"
-        OUTDIR="$outpath/$dir"
-        if [ -f "${OUTDIR}/Makefile" ] && [ "$OPT_FAST" = "yes" ]; then
-            # fast configure - the makefile exists, skip it
-            # since the makefile exists, it was generated by qmake, which means we
-            # can skip it, since qmake has a rule to regenerate the makefile if the .pro
-            # file changes...
-            [ "$OPT_VERBOSE" = "yes" ] && echo "  skipping $a"
-            continue;
-        fi
-        QMAKE_SPEC_ARGS="-spec $SPEC"
-        echo $ECHO_N "  for $a$ECHO_C"
-
-        QMAKE="$outpath/bin/qmake"
-	QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
-        if [ "$file" = ".projects.3" ]; then
-            echo " (fast)"
-
-            cat >"${OUTDIR}/Makefile" <<EOF
-# ${OUTDIR}/Makefile: generated by configure
 #
 # WARNING: This makefile will be replaced with a real makefile.
 # All changes made to this file will be lost.
-EOF
-            [ "$CFG_DEBUG_RELEASE" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
 
-            cat >>"${OUTDIR}/Makefile" <<EOF
 QMAKE = "$QMAKE"
+
+$first_tgt
 all clean install qmake first Makefile: FORCE
-	\$(QMAKE) $QMAKE_ARGS -o "$OUTDIR" "$a"
+	\$(QMAKE) $QMAKE_SWITCHES "$relpath/$p"
-	cd "$OUTDIR"
 	\$(MAKE) \$@
-
 FORCE:
-
 EOF
-        else
+            done || exit
-            if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "Done"
-                echo " (`basename $SPEC`)"
+        fi
-                echo "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a"
+    fi
-	    else
+fi
-		echo
-            fi
-
-            [ -f "${OUTDIR}/Makefile" ] && chmod +w "${OUTDIR}/Makefile"
-            QTDIR="$outpath" "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a"
-       fi
-    done
-done
-rm -f .projects .projects.3
 
 #-------------------------------------------------------------------------------
 # check for platforms that we don't yet know about

mkspecs/aix-g++-64/qmake.conf

@@ -40,8 +40,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
@@ -70,14 +68,5 @@ QMAKE_AR                = ar -X64 cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB            = ranlib -X64
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/aix-g++/qmake.conf

@@ -40,8 +40,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
@@ -70,14 +68,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/aix-xlc-64/qmake.conf

@@ -41,8 +41,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -69,14 +67,5 @@ QMAKE_AR		= ar -X64 cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		= ranlib -X64
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/aix-xlc/qmake.conf

@@ -41,8 +41,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -70,14 +68,5 @@ QMAKE_AR		= ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		= ranlib
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/common/linux.conf

@@ -9,8 +9,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
 QMAKE_INCDIR_X11      =
 QMAKE_LIBDIR_X11      =
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   =
 QMAKE_LIBDIR_OPENGL   =
 QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
@@ -51,19 +49,8 @@ QMAKE_AR              = ar cqs
 QMAKE_OBJCOPY         = objcopy
 QMAKE_RANLIB          =
 
-QMAKE_TAR             = tar -cf
-QMAKE_GZIP            = gzip -9f
-
-QMAKE_COPY            = cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE            = mv -f
-QMAKE_DEL_FILE        = rm -f
-QMAKE_DEL_DIR         = rmdir
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 

mkspecs/common/mac.conf

@@ -7,8 +7,6 @@ QMAKE_RESOURCE		= /Developer/Tools/Rez
 QMAKE_EXTENSION_SHLIB	= dylib
 
 QMAKE_LIBDIR		=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /System/Library/Frameworks/OpenGL.framework/Headers \
 	/System/Library/Frameworks/AGL.framework/Headers/
 
@@ -24,17 +22,4 @@ QMAKE_LIBS_THREAD	=
 QMAKE_AR		= ar cq
 QMAKE_RANLIB		= ranlib -s
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE		= $$QMAKE_COPY
-QMAKE_COPY_DIR		= $$QMAKE_COPY -R
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
-
-
 include(unix.conf)

mkspecs/common/qcc-base-qnx.conf

@@ -45,9 +45,6 @@ QMAKE_INCDIR            = $${QNX_DIR}/usr/include $${QNX_DIR}/usr/include/freety
 QMAKE_LIBDIR            = $${QNX_DIR}/$${QNX_CPUDIR}/lib $${QNX_DIR}/$${QNX_CPUDIR}/usr/lib
 QMAKE_LFLAGS            = -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/lib -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/usr/lib
 
-QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
-
 QMAKE_CXX               = $$QMAKE_CC -lang-c++
 
 QMAKE_LINK_C            = $$QMAKE_CC
@@ -56,17 +53,4 @@ QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
 QMAKE_LINK              = $$QMAKE_CXX
 QMAKE_LINK_SHLIB        = $$QMAKE_CXX
 
-QMAKE_TAR               = tar -cf
-QMAKE_GZIP              = gzip -9f
-
-QMAKE_COPY              = cp -f
-QMAKE_COPY_FILE         = $(COPY)
-QMAKE_COPY_DIR          = $(COPY) -r
-QMAKE_MOVE              = mv -f
-QMAKE_DEL_FILE          = rm -f
-QMAKE_DEL_DIR           = rmdir
-QMAKE_CHK_DIR_EXISTS    = test -d
-QMAKE_MKDIR             = mkdir -p
 QMAKE_STRIPFLAGS_LIB    += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS    = test -d
-QMAKE_MKDIR             = mkdir -p

mkspecs/common/shell-unix.conf

@@ -0,0 +1,14 @@
+QMAKE_TAR              = tar -cf
+QMAKE_GZIP             = gzip -9f
+
+QMAKE_COPY             = cp -f
+QMAKE_COPY_FILE        = $$QMAKE_COPY
+QMAKE_COPY_DIR         = $$QMAKE_COPY -R
+QMAKE_MOVE             = mv -f
+QMAKE_DEL_FILE         = rm -f
+QMAKE_DEL_DIR          = rmdir
+QMAKE_CHK_DIR_EXISTS   = test -d
+QMAKE_CHK_FILE_EXISTS  = test -f
+QMAKE_CHK_EXISTS_GLUE  = "|| "
+QMAKE_MKDIR            = mkdir -p
+QMAKE_STREAM_EDITOR    = sed

mkspecs/common/shell-win32.conf

@@ -0,0 +1,11 @@
+QMAKE_ZIP              = zip -r -9
+
+QMAKE_COPY             = copy /y
+QMAKE_COPY_DIR         = xcopy /s /q /y /i
+QMAKE_MOVE             = move
+QMAKE_DEL_FILE         = del
+QMAKE_DEL_DIR          = rmdir
+QMAKE_CHK_DIR_EXISTS   = if not exist
+QMAKE_CHK_FILE_EXISTS  = if not exist
+QMAKE_CHK_EXISTS_GLUE  =
+QMAKE_MKDIR            = mkdir

mkspecs/common/unix.conf

@@ -12,3 +12,5 @@ QMAKE_YACC_SOURCE       = $base.tab.c
 QMAKE_PREFIX_SHLIB      = lib
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
+
+include(shell-unix.conf)

mkspecs/common/wince/qmake.conf

@@ -45,8 +45,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -EHs-c-
 
 QMAKE_INCDIR		=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
@@ -74,15 +72,7 @@ QMAKE_IDL		= midl
 QMAKE_LIB		= lib
 QMAKE_RC		= rc
 
-QMAKE_ZIP		= zip -r -9
+include(../shell-win32.conf)
-
-QMAKE_COPY		= copy /y
-QMAKE_COPY_DIR		= xcopy /s /q /y /i
-QMAKE_MOVE		= move
-QMAKE_DEL_FILE		= del
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= if not exist
-QMAKE_MKDIR		= mkdir
 
 VCPROJ_EXTENSION	= .vcproj
 VCSOLUTION_EXTENSION	= .sln

mkspecs/cygwin-g++/qmake.conf

@@ -41,8 +41,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
@@ -75,13 +73,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
+include(../common/shell-unix.conf)
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 load(qt_config)

mkspecs/darwin-g++/qmake.conf

@@ -49,8 +49,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
@@ -81,18 +79,6 @@ QMAKE_AR		= ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		= ranlib -s
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE		= $$QMAKE_COPY
-QMAKE_COPY_DIR		= $$QMAKE_COPY -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
-
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
 QMAKE_CXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}

mkspecs/features/configure.prf

@@ -0,0 +1,90 @@
+equals(MAKEFILE_GENERATOR, UNIX): \
+    QMAKE_MAKE = make
+else:equals(MAKEFILE_GENERATOR, MINGW): \
+    QMAKE_MAKE = mingw32-make
+else:if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)): \
+    QMAKE_MAKE = nmake
+else: \
+    error("Configure tests are not supported with the $$MAKEFILE_GENERATOR Makefile generator.")
+
+# Ensure that a cache is present. If none was found on startup, this will create
+# one in the build directory of the project which loads this feature.
+cache()
+
+QMAKE_CONFIG_LOG = $$dirname(_QMAKE_CACHE_)/config.log
+QMAKE_CONFIG_TESTS_DIR = $$_PRO_FILE_PWD_/config.tests
+
+defineTest(qtRunLoggedCommand) {
+    msg = "+ $$1"
+    write_file($$QMAKE_CONFIG_LOG, msg, append)
+    system("$$1 >> \"$$QMAKE_CONFIG_LOG\" 2>&1")|return(false)
+    return(true)
+}
+
+# Try to build the test project in $$QMAKE_CONFIG_TESTS_DIR/$$1
+# ($$_PRO_FILE_PWD_/config.tests/$$1 by default).
+#
+# If the test passes, config_$$1 will be added to CONFIG.
+# The result is automatically cached. Use of cached results
+# can be suppressed by passing CONFIG+=recheck to qmake.
+#
+# Returns: true iff the test passes
+defineTest(qtCompileTest) {
+    positive = config_$$1
+    done = done_config_$$1
+
+    $$done:!recheck {
+        $$positive:return(true)
+        return(false)
+    }
+
+    log("Checking for $${1}... ")
+    msg = "executing config test $$1"
+    write_file($$QMAKE_CONFIG_LOG, msg, append)
+
+    test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$1
+    test_out_dir = $$shadowed($$test_dir)
+    test_cmd_base = "cd $$shell_quote($$native_path($$test_out_dir)) &&"
+
+    # Disable qmake features which are typically counterproductive for tests
+    qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
+
+    # Clean up after previous run
+    exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
+
+    mkpath($$test_out_dir)|error("Aborting.")
+
+    qtRunLoggedCommand("$$test_cmd_base $$shell_quote($$native_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") {
+        qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") {
+            log("yes$$escape_expand(\\n)")
+            msg = "test $$1 succeeded"
+            write_file($$QMAKE_CONFIG_LOG, msg, append)
+
+            !$$positive {
+                CONFIG += $$positive
+                cache(CONFIG, add, positive)
+            }
+            !$$done {
+                CONFIG += $$done
+                cache(CONFIG, add, done)
+            }
+            export(CONFIG)
+            return(true)
+        }
+    }
+
+    log("no$$escape_expand(\\n)")
+    msg = "test $$1 FAILED"
+    write_file($$QMAKE_CONFIG_LOG, msg, append)
+
+    $$positive {
+        CONFIG -= $$positive
+        cache(CONFIG, sub, positive)
+    }
+    !$$done {
+        CONFIG += $$done
+        cache(CONFIG, add, done)
+    }
+    export(CONFIG)
+    return(false)
+}

mkspecs/features/default_post.prf

@@ -1,6 +1,10 @@
+contains(TEMPLATE, ".*(lib|app)"):CONFIG += have_target
+
+!have_target:!force_qt: CONFIG -= qt
+
 QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
 !isEmpty(QT_BREAKPAD_ROOT_PATH): \   # quick test first whether requested ...
-        !staticlib:!static:CONFIG(release, debug|release):contains(TEMPLATE, .*(app|lib)): \   # is it applicable?
+        !staticlib:!static:CONFIG(release, debug|release):have_target: \   # is it applicable?
         !contains(TARGET, .*phony_target.*): \   # monster hack, you don't really see this here, right? ;)
         system($$QT_BREAKPAD_ROOT_PATH/qtbreakpadsymbols --breakpad-exists) {    # do we really have it?
     CONFIG += breakpad

mkspecs/features/default_pre.prf

@@ -1,45 +1,24 @@
 load(exclusive_builds)
-### Qt 5: remove "uic" and "resources" - or add "qt"
+CONFIG = lex yacc warn_on debug exceptions $$CONFIG
-CONFIG = lex yacc warn_on debug uic resources exceptions $$CONFIG
 
 !build_pass:exists($$_PRO_FILE_PWD_/sync.profile) {
-    PRO_BASENAME = $$basename(_PRO_FILE_)
+    # If the install directory is a build directory, we tell syncqt to do a -developer-build.
-
+    QTDIR = $$[QT_HOST_DATA]
-    # Try to detect proper QTDIR path. We require QTDIR, as syncqt uses that to create qt_module.pri
+    exists($$QTDIR/.qmake.cache) {
-    # forwarding files. If we don't find QTDIR, we avoid creating the fwd files, since you then need
+        QTFWD = -module-fwd $$QTDIR/mkspecs/modules -developer-build
-    # to do a 'make install;' before you can use the module
+    } else {
-    # (ie. we don't use QT_INSTALL_DATA for fwd includes. This path needs a full copy)
+        isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$OUT_PWD
-    isEmpty(QTDIR) {
+        modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules
-        QTDIR = $$(QTDIR)
+        QTFWD = -module-fwd $$modpath
-        isEmpty(QTDIR):QTDIR = $$QT_BUILD_TREE
+        !isEmpty(_QMAKE_SUPER_CACHE_):!contains(QMAKEMODULES, $$modpath): \
-        isEmpty(QTDIR) { # figure out QTDIR based on qmake binary
+            cache(QMAKEMODULES, add super, modpath)
-            QMAKE_BASED_QTDIR = $$dirname(QMAKE_QMAKE)
+        unset(modpath)
-            QTDIR = $$dirname(QMAKE_BASED_QTDIR)
-            unset(QMAKE_BASED_QTDIR)
-        }
-    }
-
-    QTFWD = -module-fwd $$OUT_PWD/module-paths/modules -cache-module-fwd
-    !isEmpty(QTDIR):exists($$QTDIR/.qmake.cache) {
-        # Only if QTDIR points to an actual build directory
-        # and this build directory is the install directory
-        # can we tell syncqt to do a -developer-build
-        win32 {
-            CMP_QDIR = $$upper($$QTDIR)
-            CMP_INSTALL_PREFIX = $$upper($$[QT_HOST_PREFIX])
-        } else {
-            CMP_QDIR = $$QTDIR
-            CMP_INSTALL_PREFIX = $$[QT_HOST_PREFIX]
-        }
-        contains(CMP_QDIR, $$CMP_INSTALL_PREFIX):QTFWD = -qtdir $$QTDIR -module-fwd $$QTDIR/mkspecs/modules -developer-build
-        unset(CMP_QDIR)
-        unset(CMP_INSTALL_PREFIX)
     }
 
     qtPrepareTool(QMAKE_SYNCQT, syncqt)
 
-    isEmpty(QMAKE_SYNCQT_OUTDIR): QMAKE_SYNCQT_OUTDIR = $$OUT_PWD
+    isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$OUT_PWD
-    MSG = $$quote($$QMAKE_SYNCQT $$QTFWD -generator $$MAKEFILE_GENERATOR -outdir $$QMAKE_SYNCQT_OUTDIR $$_PRO_FILE_PWD_)
+    MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] $$QTFWD -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_)
     !silent:message($$MSG)
     system($$MSG) {
         # success! Nothing to do
@@ -47,11 +26,10 @@ CONFIG = lex yacc warn_on debug uic resources exceptions $$CONFIG
         error("Failed to run: $$MSG")
     }
 
-    # Let qmake know about the unexpectedly appearing cache file.
+    # Do configure tests now. Fatal tests have a non zero return.
-    exists($$QMAKE_SYNCQT_OUTDIR/.qmake.cache):_QMAKE_CACHE_ = $$QMAKE_SYNCQT_OUTDIR/.qmake.cache
+    system("perl $$[QT_HOST_BINS/get]/qtmodule-configtests $$_PRO_FILE_PWD_ $$OUT_PWD $$[QT_HOST_PREFIX/get] $$MAKEFILE_GENERATOR")|error("Aborting.")
 
     unset(QTFWD)
-    unset(PRO_BASENAME)
 }
 
 # Populate the installdir which will be passed to qdoc in the default_post.prf

mkspecs/features/designer.prf

@@ -1,6 +0,0 @@
-QT += xml
-!isEmpty(QT.script.name): QT += script
-!isEmpty(QT.designer.name): QT += designer
-qt:load(qt)
-
-plugin:DEFINES += QDESIGNER_EXPORT_WIDGETS

mkspecs/features/designer_defines.prf

@@ -0,0 +1 @@
+plugin:DEFINES += QDESIGNER_EXPORT_WIDGETS

mkspecs/features/device_config.prf

@@ -1,35 +1,13 @@
 # Load generated qdevice.pri
-exists($$_QMAKE_CACHE_) {
+DEVICE_PRI = $$[QMAKE_HOST_DATA/get]/mkspecs/qdevice.pri
-    # set in default_pre, so it's the first place to check for qdevice.pri
-    DIR = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
-    !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri
-}
-
-isEmpty(DEVICE_PRI) {
-    # OUTDIR environ is set by configure (arch detection) and compile.test
-    DIR = $$(OUTDIR)
-    !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri
-}
-
-isEmpty(DEVICE_PRI) {
-    DIR = $$[QT_HOST_DATA]
-    !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri
-}
-
-isEmpty(DEVICE_PRI) {
-    error(Could not locate qdevice.pri)
-}
-
 exists($$DEVICE_PRI):include($$DEVICE_PRI)
+unset(DEVICE_PRI)
 
 isEmpty(CROSS_COMPILE) {
     #this variable can be persisted via qmake -set CROSS_COMPILE /foo
     CROSS_COMPILE = $$[CROSS_COMPILE]
 }
 
-unset(DEVICE_PRI)
-unset(DIR)
-
 # Provide a function to be used by mkspecs
 defineTest(deviceSanityCheckCompiler) {
     # Check if the binary exists with an absolute path. Do this check

mkspecs/features/help.prf

@@ -1,3 +0,0 @@
-QT += sql
-
-qtAddModule(help, true)

mkspecs/features/moc.prf

@@ -86,13 +86,6 @@ contains(QMAKE_HOST.os,Windows):moc_dir_short ~= s,^.:,/,
 contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR
 else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR
 
-# Backwards compatibility: Make shadow builds with default MOC_DIR work
-# if the user did not add the source dir explicitly.
-equals(MOC_DIR, .) {
-    CONFIG -= include_source_dir
-    CONFIG = include_source_dir $$CONFIG
-}
-
 #auto depend on moc
 unix:!no_mocdepend {
      moc_source.depends += $$first(QMAKE_MOC)

mkspecs/features/module.prf

@@ -1,7 +1 @@
-!isEmpty(MODULE_PRI) {
+warning("CONFIG+=module is obsolete. load(qt_module_config) is sufficient.")
-    pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules
-    pritarget.files = $$MODULE_PRI
-    INSTALLS += pritarget
-} else {
-    warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects")
-}

mkspecs/features/qdbus.prf

@@ -1,2 +0,0 @@
-qtAddLibrary(QtDBus)
-CONFIG += dbusadaptors dbusinterfaces

mkspecs/features/qt.prf

@@ -1,4 +1,4 @@
-CONFIG *= moc thread
+CONFIG *= thread
 
 #handle defines
 win32 {
@@ -37,9 +37,6 @@ plugin { #Qt plugins
    }
 }
 
-#handle includes
-INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes
-
 QT_PLUGIN_VERIFY = QTPLUGIN DEPLOYMENT_PLUGIN
 for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
     for(QTPLUG, $$list($$lower($$unique($$QT_CURRENT_VERIFY)))) {
@@ -101,7 +98,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
 
         # Only link against plugin in static builds
         isEqual(QT_CURRENT_VERIFY, QTPLUGIN): {
-            !isEmpty(QT_PLUGINPATH): LIBS *= -L$$[QT_INSTALL_PLUGINS]/$$QT_PLUGINPATH
+            !isEmpty(QT_PLUGINPATH): LIBS *= -L$$[QT_INSTALL_PLUGINS/get]/$$QT_PLUGINPATH
                 LIBS += $$QT_LINKAGE
             # if the plugin is linked statically there is no need to deploy it
             DEPLOYMENT_PLUGIN -= $$QT_CURRENT_VERIFY
@@ -111,7 +108,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
             CONFIG(debug, debug|release): QT_ITEM = $${QTPLUG}d4.dll
             else: QT_ITEM = $${QTPLUG}4.dll
 
-            eval(qt_additional_plugin_$${QTPLUG}.files = $$[QT_INSTALL_PLUGINS]/$${QT_PLUGINPATH}/$${QT_ITEM})
+            eval(qt_additional_plugin_$${QTPLUG}.files = $$[QT_INSTALL_PLUGINS/get]/$${QT_PLUGINPATH}/$${QT_ITEM})
             eval(qt_additional_plugin_$${QTPLUG}.path = $${QT_PLUGINPATH})
 
             DEPLOYMENT *= qt_additional_plugin_$${QTPLUG}
@@ -119,11 +116,26 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
     }
 }
 
-
+qtestlib {
-
+    warning("CONFIG+=qtestlib is deprecated. Use QT+=testlib instead.")
-#specific module settings
+    QT += testlib
-!isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
+}
-QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
+qdbus {
+    warning("CONFIG+=qdbus is deprecated. Use QT+=dbus instead.")
+    QT += dbus
+}
+help {
+    warning("CONFIG+=help is deprecated. Use QT+=help instead.")
+    QT += help-private   # sic!
+}
+designer {
+    warning("CONFIG+=desiger is deprecated. Use QT+=designer instead.")
+    QT += designer
+}
+uitools {
+    warning("CONFIG+=uitools is deprecated. Use QT+=uitools instead.")
+    QT += uitools
+}
 
 # Figure out from which modules we're wanting to use the private headers
 unset(using_privates)
@@ -134,16 +146,18 @@ for(QTLIB, QT) {
         want_var = QT.$${QTLIBRAW}.want_private
         $$want_var = UsePrivate
         using_privates = true
+        NEWQT += $$eval(QT.$${QTLIBRAW}.private_depends)
     }
     NEWQT += $$QTLIBRAW
 }
 # Topological resolution of modules based on their QT.<module>.depends variable
 QT = $$resolve_depends(NEWQT, "QT.")
 # Finally actually add the modules
+unset(BAD_QT)
 for(QTLIB, QT) {
     QTLIBNAME = $$eval(QT.$${QTLIB}.name)
     isEmpty(QTLIBNAME) {
-        message("Warning: unknown QT module: $$QTLIB")
+        BAD_QT += $$QTLIB
         next()
     }
 
@@ -154,6 +168,7 @@ for(QTLIB, QT) {
 
     qtAddModule($$QTLIB, $$eval(QT.$${QTLIB}.want_private))
 }
+!isEmpty(BAD_QT):error("Unknown module(s) in QT: $$BAD_QT")
 
 !isEmpty(using_privates):!no_private_qt_headers_warning:if(!debug_and_release|!build_pass) {
     message("This project is using private headers and will therefore be tied to this specific Qt module build version.")
@@ -161,12 +176,6 @@ for(QTLIB, QT) {
     message("This is not a bug, but a result of using Qt internals. You have been warned!")
 }
 
-qt_compat {
-   !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us
-   INCLUDEPATH *= $$QT.core.includes
-   DEFINES *= QT_COMPAT
-}
-
 wince*:static:gui {
    QTLIB += qmenu_wce.res
 }

mkspecs/features/qt_build_config.prf

@@ -0,0 +1,32 @@
+!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) {
+    QMAKE_QT_MODULE = $$[QT_HOST_DATA/get]/mkspecs/qmodule.pri
+    !exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) {
+        error("Cannot load qmodule.pri!")
+    } else {
+        debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)")
+    }
+} else {
+    debug(1, "Not loading qmodule.pri twice")
+}
+
+mac {
+   !isEmpty(QMAKE_RPATHDIR){
+       CONFIG += absolute_library_soname
+   }
+}
+
+# Qt modules get compiled without exceptions enabled by default
+CONFIG += exceptions_off
+
+#SIMD defines:
+sse2:DEFINES += QT_COMPILER_SUPPORTS_SSE2
+sse3:DEFINES += QT_COMPILER_SUPPORTS_SSE3
+ssse3:DEFINES += QT_COMPILER_SUPPORTS_SSSE3
+sse4_1:DEFINES += QT_COMPILER_SUPPORTS_SSE4_1
+sse4_2:DEFINES += QT_COMPILER_SUPPORTS_SSE4_2
+avx:DEFINES += QT_COMPILER_SUPPORTS_AVX
+avx2:DEFINES += QT_COMPILER_SUPPORTS_AVX2
+iwmmxt:DEFINES += QT_COMPILER_SUPPORTS_IWMMXT
+neon:DEFINES += QT_COMPILER_SUPPORTS_NEON
+mips_dsp:DEFINES += QT_COMPILER_SUPPORTS_MIPS_DSP
+mips_dspr2:DEFINES += QT_COMPILER_SUPPORTS_MIPS_DSPR2

mkspecs/features/qt_config.prf

@@ -1,24 +1,16 @@
-# This file is loaded by the mkspecs, before .qmake.cache has been loaded.
+QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri
-# Consequently, we have to do some stunts to get values out of the cache.
-
-exists($$_QMAKE_CACHE_) {
-    QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG)
-    QMAKE_EXTRA_MODULE_FORWARDS = $$fromfile($$_QMAKE_CACHE_, QMAKE_EXTRA_MODULE_FORWARDS)
-}
-isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
-   !isEmpty(QT_BUILD_TREE):QMAKE_QT_CONFIG = $$QT_BUILD_TREE
-   else:exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
-   isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$[QT_HOST_DATA]
-   QMAKE_QT_CONFIG = $$QMAKE_QT_CONFIG/mkspecs/qconfig.pri
-}
 !exists($$QMAKE_QT_CONFIG)|!include($$QMAKE_QT_CONFIG, "", true) {
    debug(1, "Cannot load qconfig.pri!")
 } else {
    debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)")
-   for(dir, $$list($$unique($$list($$replace($$list($$dirname(QMAKE_QT_CONFIG) \
+   QMAKE_MODULE_PATH = $$split($$list($$(QMAKEMODULES)), $$DIRLIST_SEPARATOR)
-                                                    $$replace($$list($$split($$list($$(QMAKEPATH)), $$DIRLIST_SEPARATOR)), $, /mkspecs)), \
+   QMAKE_MODULE_PATH += $$QMAKEMODULES
-                                             $, /modules) \
+   QMAKE_MODULE_PATH += $$split($$list($$[QMAKEMODULES]), $$DIRLIST_SEPARATOR)
-                                   $$QMAKE_EXTRA_MODULE_FORWARDS)))) {
+   QMAKE_MODULE_PATH += $$replace($$list($$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR)), \
+                                  \$, /modules)
+   QMAKE_MODULE_PATH = $$unique(QMAKE_MODULE_PATH)
+   QMAKE_MODULE_PATH = $$reverse(QMAKE_MODULE_PATH)
+   for(dir, QMAKE_MODULE_PATH) {
       debug(1, "Loading modules from $${dir}")
       for(mod, $$list($$files($$dir/qt_*.pri))) {
          # For installed Qt these paths will be common for all modules

mkspecs/features/qt_functions.prf

@@ -22,53 +22,17 @@ defineReplace(qtLibraryTarget) {
 }
 
 defineTest(qtAddLibrary) {
-    INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$1
+    warning("qtAddLibrary() is deprecated. Use qtAddModule() or QT+= instead.")
-    INCLUDEPATH = $$QMAKE_INCDIR_QT/$$1 $$INCLUDEPATH
 
-    LIB_NAME = $$1
+    # Reverse-engineer the module name from the library name.
-    unset(LINKAGE)
+    for(var, $$list($$find($$list($$enumerate_vars()), ^QT\\.[^.]+\\.name$))) {
-    mac {
+        isEqual($$var, $$1) {
-       CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced
+            var ~= s,^QT\\.([^.]+)\\.name$,\\1,
-          QMAKE_FRAMEWORKPATH *= $${QMAKE_LIBDIR_QT}
+            qtAddModule($$var):return(true):break()
-          FRAMEWORK_INCLUDE = $$QMAKE_LIBDIR_QT/$${LIB_NAME}.framework/Headers
+            return(false):break() # Yes, the break is insanity. But necessary.
-          !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
+        }
-             INCLUDEPATH -= $$FRAMEWORK_INCLUDE
-             INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
-           }
-           LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX}
-        } else:!qt_no_framework { #detection
-           for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
-       	      exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
-                QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
-    	        FRAMEWORK_INCLUDE = $$frmwrk_dir/$${LIB_NAME}.framework/Headers
-    	        !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
-    	          INCLUDEPATH -= $$FRAMEWORK_INCLUDE
-    	          INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
-                }
-    	        LINKAGE = -framework $${LIB_NAME}
-       	        break()
-              }
-           }
-       }
     }
-    isEmpty(LINKAGE) {
+    error("No module matching library '$$1' found.")
-       if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
-           win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
-           mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
-       }
-       isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
-    }
-    !isEmpty(QMAKE_LSB) {
-        QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT
-        QMAKE_LFLAGS *= -L/opt/lsb/lib
-        QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
-    }
-    LIBS += $$LINKAGE
-    export(LIBS)
-    export(INCLUDEPATH)
-    export(QMAKE_FRAMEWORKPATH)
-    export(QMAKE_LFLAGS)
-    return(true)
 }
 
 defineTest(qtAddModule) {
@@ -81,8 +45,12 @@ defineTest(qtAddModule) {
     CONFIG += $$eval(QT.$${1}.CONFIG)
     DEFINES += $$eval(QT.$${1}.DEFINES)
 
-    INCLUDEPATH -= $$MODULE_INCLUDES
+    unix {
-    INCLUDEPATH = $$MODULE_INCLUDES $$INCLUDEPATH
+        MODULE_INCLUDES -= /usr/include /usr/local/include
+        MODULE_LIBS -= /usr/lib /usr/local/lib
+    }
+
+    INCLUDEPATH *= $$MODULE_INCLUDES
     isEqual(2, UsePrivate) { # Tests function parameter 2 ($$2) being equal to 'UsePrivate'
         # This adds both
         #     <module privates include path>/
@@ -90,33 +58,17 @@ defineTest(qtAddModule) {
         # since we have code using both #include <QtCore/private/foo> and #include <private/foo>
         # Both need to be supported with the new private includes structure
         MODULE_INCLUDES_PRIVATES = $$eval(QT.$${1}.private_includes)
-        INCLUDEPATH -= $$MODULE_INCLUDES_PRIVATES $$MODULE_INCLUDES_PRIVATES/$$MODULE_NAME
+        INCLUDEPATH += $$MODULE_INCLUDES_PRIVATES $$MODULE_INCLUDES_PRIVATES/$$MODULE_NAME
-        INCLUDEPATH = $$MODULE_INCLUDES_PRIVATES $$MODULE_INCLUDES_PRIVATES/$$MODULE_NAME $$INCLUDEPATH
     }
 
     unset(LINKAGE)
     mac {
         !contains(MODULE_CONFIG,staticlib):CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced
           QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS}
-          FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers
+          FRAMEWORK_INCLUDE = $${MODULE_LIBS}.framework/Headers
-          !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
+          !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE): \
-               INCLUDEPATH -= $$FRAMEWORK_INCLUDE
+               INCLUDEPATH *= $$FRAMEWORK_INCLUDE
-               INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
-           }
            LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX}
-        } else:!qt_no_framework { #detection
-           for(frmwrk_dir, $$list($$MODULE_LIBS $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
-              exists($${frmwrk_dir}/$${MODULE_NAME}.framework) {
-                QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
-                FRAMEWORK_INCLUDE = $$frmwrk_dir/$${MODULE_NAME}.framework/Headers
-                !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
-                    INCLUDEPATH -= $$FRAMEWORK_INCLUDE
-                    INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
-                }
-                LINKAGE = -framework $${MODULE_NAME}
-                break()
-              }
-           }
         }
     }
 
@@ -131,10 +83,10 @@ defineTest(qtAddModule) {
     }
 
     isEmpty(LINKAGE) {
-       # Make sure we can link to uninstalled libraries
        !isEmpty(MODULE_LIBS) {
-           !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) { ### XXX
+           QMAKE_LIBDIR *= $$MODULE_LIBS
-               QMAKE_LIBDIR *= $$MODULE_LIBS
+           !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) {
+               # Make sure we can link to uninstalled libraries
                unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
            }
        }
@@ -166,8 +118,7 @@ defineTest(qtAddModule) {
 
 # variable, default
 defineTest(qtPrepareTool) {
-    MODBASE = $$[QT_HOST_BINS]
+    MODBASE = $$[QT_HOST_BINS/get]
-    !isEmpty(QT_BUILD_TREE):MODBASE = $$QT_BUILD_TREE/bin
     count(ARGS, 2, greaterThan) {
         isEmpty(QT.$${3}.bins):warning("No QT.$${3}.bins, module path ignored for qtPrepareTool($$1, $$2, $$3)")
         else:MODBASE = $$eval(QT.$${3}.bins)

mkspecs/features/qt_installs.prf

@@ -1,18 +1,16 @@
-#always install the library
+#library
-win32 {
+!qt_no_install_library {
-   dlltarget.path=$$[QT_INSTALL_BINS]
+    win32 {
-   INSTALLS += dlltarget
+       dlltarget.path = $$[QT_INSTALL_BINS]
+       INSTALLS += dlltarget
+    }
+    target.path = $$[QT_INSTALL_LIBS]
+    INSTALLS += target
 }
-target.path=$$[QT_INSTALL_LIBS]
-INSTALLS += target
 
 #headers
 qt_install_headers {
     INSTALL_HEADERS = $$SYNCQT.HEADER_FILES
-    equals(TARGET, QtCore) {
-       #headers created by configure
-       INSTALL_HEADERS *= $$QT_BUILD_TREE/src/corelib/global/qconfig.h
-    }
 
     equals(TARGET, phonon) {
         class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET
@@ -39,3 +37,13 @@ qt_install_headers {
     INSTALLS += qpa_headers
 }
 
+#module
+qt_install_module {
+    !isEmpty(MODULE_PRI) {
+        pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules
+        pritarget.files = $$MODULE_PRI
+        INSTALLS += pritarget
+    } else {
+        warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.")
+    }
+}

mkspecs/features/qt_module.prf

@@ -1,46 +1,2 @@
-# This file is loaded on-demand, before any .qmake.cache (sometimes *in* .qmake.cache), to loaded
+warning("Use load(qt_build_config) instead of load(qt_module).")
-# important settings for modules, such as paths to QtBase, settings etc.
+load(qt_build_config)
-# Consequently, we have to do some stunts to figure out where to find qmodule.pri.
-
-isEmpty(QMAKE_QT_MODULE)|!exists($$QMAKE_QT_MODULE) {
-   exists($$QTDIR/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QTDIR/mkspecs/qmodule.pri
-   QMAKE_CACHE_DIR = $$dirname(_QMAKE_CACHE_)
-   !exists($$QMAKE_QT_MODULE):exists($$QMAKE_CACHE_DIR/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QMAKE_CACHE_DIR/mkspecs/qmodule.pri
-   !exists($$QMAKE_QT_MODULE):exists($$QMAKE_CACHE_DIR/qtbase/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QMAKE_CACHE_DIR/qtbase/mkspecs/qmodule.pri
-   !exists($$QMAKE_QT_MODULE):if(!isEmpty(QT_BUILD_TREE) & exists($$QT_BUILD_TREE/mkspecs/qmodule.pri)):QMAKE_QT_MODULE = $$QT_BUILD_TREE/mkspecs/qmodule.pri
-   !exists($$QMAKE_QT_MODULE):exists($$[QT_HOST_DATA]/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$[QT_HOST_DATA]/mkspecs/qmodule.pri
-}
-
-!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) {
-    !exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) {
-        error("Cannot load qmodule.pri!")
-    } else {
-        QMAKE_QT_MODULE_PRI_LOADED = 1
-        debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)")
-    }
-} else {
-    QMAKE_QT_MODULE_PRI_LOADED = 1  # covers 'preloading' from .qmake.cache
-    debug(1, "Not loading qmodule.pri twice")
-}
-
-mac {
-   !isEmpty(QMAKE_RPATHDIR){
-       CONFIG += absolute_library_soname
-   }
-}
-
-# Qt modules get compiled without exceptions enabled by default
-CONFIG += exceptions_off
-
-#SIMD defines:
-sse2:DEFINES += QT_COMPILER_SUPPORTS_SSE2
-sse3:DEFINES += QT_COMPILER_SUPPORTS_SSE3
-ssse3:DEFINES += QT_COMPILER_SUPPORTS_SSSE3
-sse4_1:DEFINES += QT_COMPILER_SUPPORTS_SSE4_1
-sse4_2:DEFINES += QT_COMPILER_SUPPORTS_SSE4_2
-avx:DEFINES += QT_COMPILER_SUPPORTS_AVX
-avx2:DEFINES += QT_COMPILER_SUPPORTS_AVX2
-iwmmxt:DEFINES += QT_COMPILER_SUPPORTS_IWMMXT
-neon:DEFINES += QT_COMPILER_SUPPORTS_NEON
-mips_dsp:DEFINES += QT_COMPILER_SUPPORTS_MIPS_DSP
-mips_dspr2:DEFINES += QT_COMPILER_SUPPORTS_MIPS_DSPR2

mkspecs/features/qt_module_config.prf

@@ -1,38 +1,107 @@
-!no_qt_module_warning:if(!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\\\.pri)|isEmpty(QMAKE_QT_MODULE_PRI_LOADED)) {
+!no_qt_module_warning:!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) {
     QMAKE_ACTUAL_PRO_FILE = $$basename(_PRO_FILE_)
     isEmpty(QMAKE_ACTUAL_PRO_FILE): QMAKE_ACTUAL_PRO_FILE=.pro
-    warning("You should probably load(qt_module) first in $$QMAKE_ACTUAL_PRO_FILE for $$TARGET, as it also load()s qt_module_config.")
+    warning("You should probably load(qt_build_config) first in $$QMAKE_ACTUAL_PRO_FILE for $$TARGET, as the latter also load()s qt_module_config.")
     message("Not doing so may lead to qt_module_config.prf overriding compiler/linker options in your .pro file.")
     message("Ignore this warning with CONFIG+=no_qt_module_warning if you know what you are doing.")
     unset(QMAKE_ACTUAL_PRO_FILE)
 }
-load(qt_module) # loads qmodule.pri if hasn't been loaded already
+load(qt_build_config) # loads qmodule.pri if hasn't been loaded already
 
 isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0)
 isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}")
+isEmpty(VERSION):VERSION = $$QT_VERSION
+
+ucmodule = $$upper($$MODULE)
+
+MODULE_DEPENDS = $$replace(QT, -private$, )
+
+# Find the module's source root dir.
+MODULE_PROFILE_DIR = $$_PRO_FILE_PWD_
+for(ever) {
+    exists($$MODULE_PROFILE_DIR/sync.profile):break()
+    nmpri = $$dirname(MODULE_PROFILE_DIR)
+    equals(nmpri, $$MODULE_PROFILE_DIR):error("No sync.profile found. This does not look like a Qt module source tree.")
+    MODULE_PROFILE_DIR = $$nmpri
+    unset(nmpri)
+}
+
+isEmpty(MODULE_BASE_DIR): MODULE_BASE_DIR = $$MODULE_PROFILE_DIR
+MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_DIR)
+isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR
+
+# This check will be removed soon. Weird indentation to avoid reindenting the code later.
+!isEmpty(MODULE_PRI) {
+    !build_pass:warning("$$_PRO_FILE_ still sets MODULE_PRI. Not auto-generating module .pri file.")
+    MODULE_PRI = $$absolute_path($$MODULE_PRI, $$_PRO_FILE_PWD_)
+    exists($$MODULE_PRI)|error("Specified module pri file $$MODULE_PRI does not exist.")
+} else {
+
+MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_$${MODULE}.pri
+
+!build_pass {
+
+    # Create a module .pri file
+    !isEmpty(QT_PRIVATE) {
+        contains(QT_PRIVATE, .*-private$):error("QT_PRIVATE may not contain *-private.")
+        module_privdep = "QT.$${MODULE}.private_depends = $$QT_PRIVATE"
+    } else {
+        module_privdep =
+    }
+    staticlib: \
+        module_build_type = "QT.$${MODULE}.module_config = staticlib"
+    else:mac:!static:contains(QT_CONFIG, qt_framework): \
+        module_build_type = "QT.$${MODULE}.module_config = lib_bundle"
+    else: \
+        module_build_type =
+    !isEmpty(MODULE_CONFIG): \
+        module_config = "QT.$${MODULE}.CONFIG = $$MODULE_CONFIG"
+    else: \
+        module_config =
+    contains(TARGET, QtAddOn.*): \
+        MODULE_DEFINE = QT_ADDON_$${ucmodule}_LIB
+    else: \
+        MODULE_DEFINE = QT_$${ucmodule}_LIB
+    MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES
+    MODULE_PRI_CONT = \
+        "QT.$${MODULE}.VERSION = $${VERSION}" \
+        "QT.$${MODULE}.MAJOR_VERSION = $$section(VERSION, ., 0, 0)" \
+        "QT.$${MODULE}.MINOR_VERSION = $$section(VERSION, ., 1, 1)" \
+        "QT.$${MODULE}.PATCH_VERSION = $$section(VERSION, ., 2, 2)" \
+        "" \
+        "QT.$${MODULE}.name = $$TARGET" \
+        "QT.$${MODULE}.bins = \$\$QT_MODULE_BIN_BASE" \
+        "QT.$${MODULE}.includes = \$\$QT_MODULE_INCLUDE_BASE \$\$QT_MODULE_INCLUDE_BASE/$$TARGET" \
+        "QT.$${MODULE}.private_includes = \$\$QT_MODULE_INCLUDE_BASE/$$TARGET/\$\$QT.$${MODULE}.VERSION" \
+        "QT.$${MODULE}.sources = $$val_escape(_PRO_FILE_PWD_)" \
+        "QT.$${MODULE}.libs = \$\$QT_MODULE_LIB_BASE" \
+        "QT.$${MODULE}.plugins = \$\$QT_MODULE_PLUGIN_BASE" \
+        "QT.$${MODULE}.imports = \$\$QT_MODULE_IMPORT_BASE" \
+        "QT.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \
+        $$module_privdep \
+        $$module_build_type \
+        $$module_config \
+        "QT.$${MODULE}.DEFINES = $$MODULE_DEFINES" \ # assume sufficient quoting
+        "" \
+        "QT_CONFIG += $$MODULE" # this is obsolete, but some code still depends on it
+    write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.")
+
+} # !build_pass
+
+} # isEmpty(MODULE_PRI)
+
+load(qt_module_fwdpri)
 
 MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes)
 MODULE_PRIVATE_INCLUDES = $$eval(QT.$${MODULE}.private_includes)
+INCLUDEPATH *= $$MODULE_INCLUDES
 INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES
 INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES/$$TARGET
-INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat
-!isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR
-TEMPLATE        = lib
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=5.0.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
 
-#load up the headers info
+load(qt_module_headers)
-CONFIG += qt_install_headers
-#headers.pri is loaded from the last include path
-LAST_MODULE_INCLUDE=$$MODULE_INCLUDES
-for(include_path, MODULE_INCLUDES):LAST_MODULE_INCLUDE=$${include_path}
-HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri
-include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
 
 #other
+TEMPLATE         = lib
 DESTDIR          = $$eval(QT.$${MODULE}.libs)
 win32:!wince*:DLLDESTDIR = $$[QT_INSTALL_PREFIX]/bin
 
@@ -48,8 +117,16 @@ if(win32|mac):!wince*:!macx-xcode {
 
 linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 
+QT += $$QT_PRIVATE
+unset(QT_PRIVATE)
+
 !isEmpty(DESTDIR):CONFIG += create_cmake
 
+contains(TARGET, QtAddOn.*): \
+    DEFINES += QT_BUILD_ADDON_$${ucmodule}_LIB
+else: \
+    DEFINES += QT_BUILD_$${ucmodule}_LIB
+
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
 contains(QT_CONFIG, largefile):CONFIG += largefile
@@ -67,12 +144,6 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
           FRAMEWORK_HEADERS.version = Versions
           FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
           FRAMEWORK_HEADERS.path = Headers
-          equals(TARGET, QtCore) {
-              #headers generated by configure
-              !contains(FRAMEWORK_HEADERS.files, .*/qconfig.h) {
-                  FRAMEWORK_HEADERS.files *= $$QT_BUILD_TREE/src/corelib/global/qconfig.h
-              }
-          }
       }
       QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
    }
@@ -106,15 +177,6 @@ aix-g++* {
      QMAKE_CXXFLAGS += -mminimal-toc
 }
 
-embedded {
-     EMBEDDED_H = $$EMBEDDED_CPP
-}
-
-DEPENDPATH += ;$$NETWORK_H;$$KERNEL_H;$$WIDGETS_H;$$SQL_H;$$TABLE_H;$$DIALOGS_H;
-DEPENDPATH += $$ICONVIEW_H;$$OPENGL_H;$$THREAD_H;$$TOOLS_H;$$CODECS_H;
-DEPENDPATH += $$WORKSPACE_H;$$XML_H;$$STYLES_H;$$COMPAT_H
-embedded:DEPENDPATH += ;$$EMBEDDED_H
-
 !static:PRL_EXPORT_DEFINES += QT_SHARED
 
 #install directives
@@ -126,9 +188,9 @@ unix|win32-g++* {
    QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]/$$TARGET
    QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS/raw]
    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-   include_replace.match = $$QMAKE_INCDIR_QT
+   include_replace.match = $$[QT_INSTALL_HEADERS/get]
    include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
-   lib_replace.match = $$QMAKE_LIBDIR_QT
+   lib_replace.match = $$[QT_INSTALL_LIBS/get]
    lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
    prefix_replace.match = $$QT_BUILD_TREE
    prefix_replace.replace = $$[QT_INSTALL_PREFIX/raw]
@@ -143,6 +205,12 @@ unix {
    QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
 }
 
+unix|win32-g++* {
+    for(i, QT):QMAKE_PKGCONFIG_REQUIRES += $$eval(QT.$${i}.name)
+    isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \
+        QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module
+}
+
 contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
 DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
 DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code
@@ -151,29 +219,6 @@ DEFINES *= QT_DEPRECATED_WARNINGS
 
 TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
 
-qtPrepareTool(QMAKE_MOC, moc)
-qtPrepareTool(QMAKE_UIC, uic)
-qtPrepareTool(QMAKE_RCC, rcc)
-qtPrepareTool(QMAKE_LUPDATE, lupdate)
-qtPrepareTool(QMAKE_LRELEASE, lrelease)
-
-moc_dir.name = moc_location
-moc_dir.variable = QMAKE_MOC
-
-uic_dir.name = uic_location
-uic_dir.variable = QMAKE_UIC
-
-rcc_dir.name = rcc_location
-rcc_dir.variable = QMAKE_RCC
-
-lupdate_dir.name = lupdate_location
-lupdate_dir.variable = QMAKE_LUPDATE
-
-lrelease_dir.name = lrelease_location
-lrelease_dir.variable = QMAKE_LRELEASE
-
-QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir
-
 load(qt_targets)
 
 win32:DEFINES+=_USE_MATH_DEFINES

mkspecs/features/qt_module_fwdpri.prf

@@ -0,0 +1,52 @@
+!build_pass {
+
+    QTDIR = $$[QT_HOST_PREFIX]
+    exists($$QTDIR/.qmake.cache) {
+        mod_component_base = $$QTDIR
+        mod_qmake_base = $$QTDIR
+    } else {
+        mod_component_base = $$MODULE_BASE_OUTDIR
+        mod_qmake_base = $$MODULE_QMAKE_OUTDIR
+    }
+    # Permit modules to enforce being built outside QTDIR.
+    force_independent: mod_component_base = $$MODULE_BASE_OUTDIR
+
+    # This check will be removed soon. Weird indentation to avoid reindenting the code later.
+    syncprofile = $$cat($$MODULE_PROFILE_DIR/sync.profile, lines)
+    contains(syncprofile, "^%modulepris.*") {
+        MODULE_FWD_PRI = $$mod_qmake_base/mkspecs/modules/$$replace(MODULE_PRI, ^.*/,)
+    } else {
+
+    MODULE_FWD_PRI = $$mod_qmake_base/mkspecs/modules/qt_$${MODULE}.pri
+
+    # Create a forwarding module .pri file
+    MODULE_FWD_PRI_CONT = \
+        "QT_MODULE_BASE = $$MODULE_BASE_DIR" \
+        "QT_MODULE_BIN_BASE = $$mod_component_base/bin" \
+        "QT_MODULE_INCLUDE_BASE = $$MODULE_BASE_OUTDIR/include" \
+        "QT_MODULE_IMPORT_BASE = $$mod_component_base/imports" \
+        "QT_MODULE_LIB_BASE = $$mod_component_base/lib" \
+        "QT_MODULE_PLUGIN_BASE = $$mod_component_base/plugins" \
+        "include($$MODULE_PRI)"
+    write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error("Aborting.")
+    touch($$MODULE_FWD_PRI, $$MODULE_PRI)
+
+    } # create forwarding module pris
+
+    # Then, inject the new module into the current cache state
+    !contains(QMAKE_INTERNAL_INCLUDED_FILES, $$MODULE_PRI) { # before the actual include()!
+        added = $$MODULE_PRI $$MODULE_FWD_PRI
+        cache(QMAKE_INTERNAL_INCLUDED_FILES, add transient, added)
+        unset(added)
+    }
+    include($$MODULE_FWD_PRI)
+    for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
+                    name depends private_depends module_config CONFIG DEFINES sources \
+                    includes private_includes bins libs plugins imports \
+            )):defined(QT.$${MODULE}.$$var, var):cache(QT.$${MODULE}.$$var, transient)
+    cache(QT_CONFIG, transient)
+
+} # !build_pass
+
+# Schedule the regular .pri file for installation
+CONFIG += qt_install_module

mkspecs/features/qt_module_headers.prf

@@ -0,0 +1,61 @@
+#load up the headers info
+include($$MODULE_BASE_OUTDIR/include/$$TARGET/headers.pri, "", true)
+
+lctarget = $$lower($$TARGET)
+uctarget = $$upper($$TARGET)
+
+defineTest(shouldMasterInclude) {
+    bn = $$basename(1)
+    contains(bn, .*_.*):return(false)
+    contains(bn, ^qconfig.*):return(false)
+    lines = $$cat($$_PRO_FILE_PWD_/$$1, lines)
+    contains(lines, $${LITERAL_HASH}pragma qt_no_master_include):return(false)
+    return(true)
+}
+
+# Create module version header
+MODULE_VERSION_HEADER = $$find(SYNCQT.HEADER_FILES, (^|/)$${lctarget}version\\.h$)
+count(MODULE_VERSION_HEADER, 1) {
+    MODULE_VERSION_HEADER = $$absolute_path($$MODULE_VERSION_HEADER, $$_PRO_FILE_PWD_)
+
+    !build_pass {
+        majorhexstr = $$format_number($$section(VERSION, ., 0, 0), width=2 zeropad obase=16)
+        minorhexstr = $$format_number($$section(VERSION, ., 1, 1), width=2 zeropad obase=16)
+        patchhexstr = $$format_number($$section(VERSION, ., 2, 2), width=2 zeropad obase=16)
+        modulehexstring = 0x$${majorhexstr}$${minorhexstr}$${patchhexstr}
+        MODULE_VERSION_HEADER_CONT = \
+            "/* This file was generated by qmake with the info from $${_PRO_FILE_}. */" \
+            "$${LITERAL_HASH}ifndef QT_$${uctarget}_VERSION_H" \
+            "$${LITERAL_HASH}define QT_$${uctarget}_VERSION_H" \
+            "" \
+            "$${LITERAL_HASH}define $${uctarget}_VERSION_STR \"$$VERSION\"" \
+            "" \
+            "$${LITERAL_HASH}define $${uctarget}_VERSION $$modulehexstring" \
+            "" \
+            "$${LITERAL_HASH}endif // QT_$${uctarget}_VERSION_H"
+        write_file($$MODULE_VERSION_HEADER, MODULE_VERSION_HEADER_CONT)|error("Aborting.")
+    }
+
+    HEADERS += $$MODULE_VERSION_HEADER
+}
+
+# Create a module master header
+MODULE_MASTER_HEADER = $$MODULE_BASE_OUTDIR/include/$$TARGET/$$TARGET
+!build_pass {
+    MODULE_MASTER_HEADER_CONT = \
+        "/* This file was generated by qmake with the info from $${_PRO_FILE_}. */" \
+        "$${LITERAL_HASH}ifndef QT_$${ucmodule}_MODULE_H" \
+        "$${LITERAL_HASH}define QT_$${ucmodule}_MODULE_H"
+    for(dep, MODULE_DEPENDS) {
+        depname = $$eval(QT.$${dep}.name)
+        MODULE_MASTER_HEADER_CONT += "$${LITERAL_HASH}include <$$depname/$$depname>"
+    }
+    for(hdr, SYNCQT.HEADER_FILES): \
+        shouldMasterInclude($$hdr): \
+            MODULE_MASTER_HEADER_CONT += "$${LITERAL_HASH}include \"$$replace(hdr, .*/, )\""
+    MODULE_MASTER_HEADER_CONT += "$${LITERAL_HASH}endif"
+    write_file($$MODULE_MASTER_HEADER, MODULE_MASTER_HEADER_CONT)|error("Aborting.")
+}
+SYNCQT.HEADER_FILES += $$MODULE_MASTER_HEADER
+
+CONFIG += qt_install_headers

mkspecs/features/qt_plugin.prf

@@ -1,9 +1,5 @@
 TEMPLATE = lib
-isEmpty(QT_MAJOR_VERSION) {
+isEmpty(VERSION):VERSION = $$QT_VERSION
-   VERSION=5.0.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
 CONFIG += qt plugin
 
 if(win32|mac):!wince*:!macx-xcode {

mkspecs/features/qtestlib.prf

@@ -1,4 +0,0 @@
-
-CONFIG += console
-
-qtAddLibrary(QtTest)

mkspecs/features/resources.prf

@@ -1,4 +1,3 @@
-defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf
 qtPrepareTool(QMAKE_RCC, rcc)
 
 isEmpty(RCC_DIR):RCC_DIR = .

mkspecs/features/static_and_shared.prf

@@ -1,3 +1,3 @@
-!contains(TEMPLATE, subdirs):!macx-xcode {
+have_target:!macx-xcode {
     addExclusiveBuilds(static, Static, shared, Shared)
 }

mkspecs/features/testcase.prf

@@ -1,4 +1,4 @@
-!contains(TEMPLATE,subdirs) {
+have_target {
 
 check.files                =
 check.path                 = .
@@ -128,7 +128,7 @@ contains(INSTALLS, target) {
     }
 }
 
-}
+} # have_target
 
 defineTest(installTestHelperApp) {
     # args: relativeSource, relativeDestination, targetName

mkspecs/features/testlib_defines.prf

@@ -0,0 +1 @@
+DEFINES += QT_TESTCASE_BUILDDIR=\\\"$$OUT_PWD\\\"

mkspecs/features/uic.prf

@@ -1,4 +1,3 @@
-defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf
 qtPrepareTool(QMAKE_UIC3, uic3)
 qtPrepareTool(QMAKE_UIC, uic)
 
@@ -34,13 +33,6 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_
     else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR
 }
 
-# Backwards compatibility: Make shadow builds with default UI_DIR work
-# if the user did not add the source dir explicitly.
-equals(UI_DIR, .) {
-    CONFIG -= include_source_dir
-    CONFIG = include_source_dir $$CONFIG
-}
-
 uic3 {
     isEmpty(FORMS3) {
         UIC3_FORMS = FORMS

mkspecs/features/uitools.prf

@@ -1,13 +0,0 @@
-QT += xml
-qt:load(qt)
-
-# Include the correct version of the UiLoader library
-QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
-
-CONFIG(debug, debug|release) {
-    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
-    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
-}
-LIBS += $$QTUITOOLS_LINKAGE
-
-INCLUDEPATH = $$QT.uitools.includes $$INCLUDEPATH

mkspecs/features/unix/gdb_dwarf_index.prf

@@ -1,4 +1,4 @@
-!CONFIG(separate_debug_info):CONFIG(debug, debug|release):!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) {
+!CONFIG(separate_debug_info):CONFIG(debug, debug|release):have_target:!staticlib:!static:!isEmpty(QMAKE_OBJCOPY) {
 
     contains(TEMPLATE, "lib") {
         QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } &&

mkspecs/features/unix/separate_debug_info.prf

@@ -1,5 +1,5 @@
 
-!separate_debug_info_nocopy:!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) {
+!separate_debug_info_nocopy:have_target:!staticlib:!static:!isEmpty(QMAKE_OBJCOPY) {
     QMAKE_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\"
     QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/
 

mkspecs/features/win32/qaxserver.prf

@@ -9,9 +9,9 @@ isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0
 DEFINES += QAXSERVER
 INCLUDEPATH += $$QT.activeqt.includes
 
+qtPrepareTool(QMAKE_IDC, idc, activeqt)
 contains(TEMPLATE, "vc.*") {
-    ACTIVEQT_IDC = $${QMAKE_IDC}   ### Qt5: remove me
+    ACTIVEQT_IDC = $${QMAKE_IDC}
-    qtPrepareTool(ACTIVEQT_IDC, idc)
     ACTIVEQT_IDL = $${QMAKE_IDL}
     ACTIVEQT_TARGET = "$(TargetPath)"
     win32-msvc {

mkspecs/freebsd-g++/qmake.conf

@@ -17,8 +17,6 @@ QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		= /usr/local/lib
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
@@ -35,15 +33,6 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)

mkspecs/freebsd-g++46/qmake.conf

@@ -17,8 +17,6 @@ QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		= /usr/local/lib
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
@@ -35,15 +33,6 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)

mkspecs/freebsd-icc/qmake.conf

@@ -66,8 +66,6 @@ QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		= /usr/local/lib
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
@@ -93,14 +91,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/hpux-acc-64/qmake.conf

@@ -83,8 +83,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/X11R6/pa20_64
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
 
@@ -114,14 +112,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/hpux-acc-o64/qmake.conf

@@ -81,8 +81,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/X11R6
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
 
@@ -112,14 +110,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/hpux-acc/qmake.conf

@@ -62,8 +62,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/X11R6
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
 
@@ -93,14 +91,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/hpux-g++-64/qmake.conf

@@ -43,8 +43,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		= /usr/lib/pa20_64
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/X11R6/pa20_64
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /opt/Mesa/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/Mesa/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
 
@@ -76,14 +74,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/hpux-g++/qmake.conf

@@ -43,8 +43,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	= /usr/lib/X11R6
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /opt/Mesa/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/Mesa/lib /usr/contrib/X11R6/lib
 
@@ -76,14 +74,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/hpuxi-acc-32/qmake.conf

@@ -39,8 +39,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/hpux32/X11R6
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib/hpux32 /usr/contrib/X11R6/lib/hpux32
 
@@ -68,14 +66,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/hpuxi-acc-64/qmake.conf

@@ -82,8 +82,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/hpux64/X11R6
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64
 
@@ -111,14 +109,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/hpuxi-g++-64/qmake.conf

@@ -48,8 +48,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		= /usr/lib/hpux64
 QMAKE_INCDIR_X11	= /usr/include/X11R6
 QMAKE_LIBDIR_X11	= /usr/lib/hpux64/X11R6
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64
 
@@ -79,14 +77,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/hurd-g++/qmake.conf

@@ -16,8 +16,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
 QMAKE_INCDIR_X11      = /usr/X11R6/include
 QMAKE_LIBDIR_X11      = /usr/X11R6/lib
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
 QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
@@ -45,19 +43,8 @@ QMAKE_AR              = ar cqs
 QMAKE_OBJCOPY         = objcopy
 QMAKE_RANLIB          =
 
-QMAKE_TAR             = tar -cf
-QMAKE_GZIP            = gzip -9f
-
-QMAKE_COPY            = cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE            = mv -f
-QMAKE_DEL_FILE        = rm -f
-QMAKE_DEL_DIR         = rmdir
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 

mkspecs/irix-cc-64/qmake.conf

@@ -75,8 +75,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -106,14 +104,5 @@ QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/irix-cc/qmake.conf

@@ -75,8 +75,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -106,14 +104,5 @@ QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/irix-g++-64/qmake.conf

@@ -41,8 +41,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -76,14 +74,5 @@ QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= so_locations
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/irix-g++/qmake.conf

@@ -41,8 +41,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -76,14 +74,5 @@ QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= so_locations
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/linux-cxx/qmake.conf

@@ -40,8 +40,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -65,14 +63,5 @@ QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/linux-ecc-64/qmake.conf

@@ -42,8 +42,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -72,14 +70,5 @@ QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)/ti_files
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/linux-icc/qmake.conf

@@ -49,8 +49,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -81,16 +79,6 @@ QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)/ti_files
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
-
 # pch support
 CONFIG += icc_pch_style
 QMAKE_PCH_OUTPUT_EXT    = .pchi

mkspecs/linux-kcc/qmake.conf

@@ -51,8 +51,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -81,14 +79,5 @@ QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)ti_files
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/linux-pgcc/qmake.conf

@@ -42,8 +42,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -70,14 +68,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/lynxos-g++/qmake.conf

@@ -43,8 +43,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /usr/include/X11
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/include/GL
 QMAKE_LIBDIR_OPENGL	=
 
@@ -73,16 +71,8 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
 QMAKE_STRIP             = strip
 QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
-QMAKE_CHK_DIR_EXISTS	= test -d
+
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/macx-xlc/qmake.conf

@@ -45,8 +45,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /System/Library/Frameworks/OpenGL.framework/Headers \
         /System/Library/Frameworks/AGL.framework/Headers/
 QMAKE_LIBDIR_OPENGL	=
@@ -81,16 +79,5 @@ QMAKE_AR		= ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		= ranlib -s
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE         = $$QMAKE_COPY
-QMAKE_COPY_DIR          = $$QMAKE_COPY -R
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/netbsd-g++/qmake.conf

@@ -40,8 +40,6 @@ QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		= /usr/local/lib
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
@@ -71,14 +69,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		= ranlib
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/openbsd-g++/qmake.conf

@@ -40,8 +40,6 @@ QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		= /usr/local/lib
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
@@ -72,14 +70,5 @@ QMAKE_AR		= ar q
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		= ranlib
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/sco-cc/qmake.conf

@@ -41,8 +41,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	= /usr/X/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -66,14 +64,5 @@ QMAKE_AR		= ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/sco-g++/qmake.conf

@@ -40,8 +40,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -68,14 +66,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/solaris-cc-64/qmake.conf

@@ -61,8 +61,6 @@ QMAKE_INCDIR		= /usr/sfw/include
 QMAKE_LIBDIR		= /usr/sfw/lib/64
 QMAKE_INCDIR_X11	= /usr/openwin/include
 QMAKE_LIBDIR_X11	= /usr/openwin/lib/64
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/openwin/include
 QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib/64
 
@@ -93,14 +91,5 @@ QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/solaris-cc/qmake.conf

@@ -44,8 +44,6 @@ QMAKE_INCDIR		= /usr/sfw/include
 QMAKE_LIBDIR		= /usr/sfw/lib
 QMAKE_INCDIR_X11	= /usr/openwin/include
 QMAKE_LIBDIR_X11	= /usr/openwin/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/openwin/include
 QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib
 
@@ -76,14 +74,5 @@ QMAKE_RANLIB		=
 
 QMAKE_CLEAN		= -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/solaris-g++-64/qmake.conf

@@ -63,8 +63,6 @@ QMAKE_INCDIR		= /usr/sfw/include
 QMAKE_LIBDIR		= /usr/sfw/lib/64
 QMAKE_INCDIR_X11	= /usr/openwin/include
 QMAKE_LIBDIR_X11	= /usr/openwin/lib/64
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/openwin/include
 QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib/64
 
@@ -95,14 +93,5 @@ QMAKE_AR		= ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/solaris-g++/qmake.conf

@@ -46,8 +46,6 @@ QMAKE_INCDIR		= /usr/sfw/include
 QMAKE_LIBDIR		= /usr/sfw/lib
 QMAKE_INCDIR_X11	= /usr/openwin/include
 QMAKE_LIBDIR_X11	= /usr/openwin/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/openwin/include
 QMAKE_LIBDIR_OPENGL	= /usr/openwin/lib
 
@@ -78,14 +76,5 @@ QMAKE_AR		= ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/tru64-cxx/qmake.conf

@@ -40,8 +40,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -67,14 +65,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/tru64-g++/qmake.conf

@@ -40,8 +40,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -69,14 +67,5 @@ QMAKE_AR		= ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/unixware-cc/qmake.conf

@@ -43,8 +43,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	= /usr/X/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -72,14 +70,5 @@ QMAKE_AR		= ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/unixware-g++/qmake.conf

@@ -42,8 +42,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	= /usr/X/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -71,14 +69,5 @@ QMAKE_AR		= ar cq
 QMAKE_OBJCOPY           = objcopy
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 include(../common/unix.conf)
 load(qt_config)

mkspecs/unsupported/integrity-ghs/qmake.conf

@@ -30,8 +30,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	=
 QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	=
 QMAKE_LIBDIR_OPENGL	=
 
@@ -52,14 +50,6 @@ QMAKE_LIBS_THREAD       =
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
+include(../../common/shell-unix.conf)
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 load(qt_config)
 

mkspecs/unsupported/linux-host-g++/qmake.conf

@@ -82,8 +82,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
 QMAKE_INCDIR_X11      =
 QMAKE_LIBDIR_X11      =
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   =
 QMAKE_LIBDIR_OPENGL   =
 QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
@@ -111,19 +109,8 @@ QMAKE_AR              = host-ar cqs
 QMAKE_OBJCOPY         = host-objcopy
 QMAKE_RANLIB          =
 
-QMAKE_TAR             = tar -cf
-QMAKE_GZIP            = gzip -9f
-
-QMAKE_COPY            = cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE            = mv -f
-QMAKE_DEL_FILE        = rm -f
-QMAKE_DEL_DIR         = rmdir
 QMAKE_STRIP           = host-strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 

mkspecs/unsupported/qnx-X11-g++/qmake.conf

@@ -22,8 +22,6 @@ QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
 QMAKE_INCDIR_X11	= /opt/X11R6/include
 QMAKE_LIBDIR_X11	= /opt/X11R6/lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /opt/X11R6/include
 QMAKE_LIBDIR_OPENGL	= /opt/X11R6/lib
 
@@ -39,19 +37,7 @@ QMAKE_LIBS_NETWORK      = -lsocket
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
+
-QMAKE_MKDIR           = mkdir -p
 load(qt_config)

mkspecs/unsupported/qws/qnx-641/qmake.conf

@@ -66,9 +66,6 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
-
 
 QMAKE_LIBS		= -lm -lz
 QMAKE_LIBS_DYNLOAD	=
@@ -79,19 +76,7 @@ QMAKE_LIBS_GUI          += -lsocket
 QMAKE_AR		= ntox86-ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
+
-QMAKE_MKDIR           = mkdir -p
 load(qt_config)

mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf

@@ -68,8 +68,6 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CLFAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 
 #QMAKE_LIBS		= -lunix
 QMAKE_LIBS		=
@@ -81,19 +79,7 @@ QMAKE_LIBS_GUI          += -lsocket
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
+
-QMAKE_MKDIR           = mkdir -p
 load(qt_config)

mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf

@@ -64,8 +64,6 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 
 #QMAKE_LIBS		= -lunix
 QMAKE_LIBS		=
@@ -77,19 +75,7 @@ QMAKE_LIBS_GUI          += -lsocket
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
+
-QMAKE_MKDIR           = mkdir -p
 load(qt_config)

mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf

@@ -64,8 +64,6 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CLFAGS_THREAD
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 
 #QMAKE_LIBS		= -lunix
 QMAKE_LIBS		=
@@ -77,19 +75,7 @@ QMAKE_LIBS_GUI          += -lsocket
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
+
-QMAKE_MKDIR           = mkdir -p
 load(qt_config)

mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf

@@ -68,8 +68,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
 QMAKE_INCDIR_X11      = $(WIND_HOME)/GSS/include
 QMAKE_LIBDIR_X11      = $(WIND_HOME)/GSS/lib
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   = $$QMAKE_INCDIR_X11
 QMAKE_LIBDIR_OPENGL   = $$QMAKE_LIBDIR_X11
 
@@ -87,19 +85,8 @@ QMAKE_AR              = ar cqs
 QMAKE_OBJCOPY         = objcopy
 QMAKE_RANLIB          =
 
-QMAKE_TAR             = tar -cf
-QMAKE_GZIP            = gzip -9f
-
-QMAKE_COPY            = cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE            = mv -f
-QMAKE_DEL_FILE        = rm -f
-QMAKE_DEL_DIR         = rmdir
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 

mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf

@@ -68,8 +68,6 @@ QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
 QMAKE_INCDIR_X11      = $(WIND_HOME)/GSS/include
 QMAKE_LIBDIR_X11      = $(WIND_HOME)/GSS/lib
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL   = $$QMAKE_INCDIR_X11
 QMAKE_LIBDIR_OPENGL   = $$QMAKE_LIBDIR_X11
 
@@ -86,19 +84,8 @@ QMAKE_AR              = ar cqs
 QMAKE_OBJCOPY         = objcopy
 QMAKE_RANLIB          =
 
-QMAKE_TAR             = tar -cf
-QMAKE_GZIP            = gzip -9f
-
-QMAKE_COPY            = cp -f
-QMAKE_COPY_FILE       = $(COPY)
-QMAKE_COPY_DIR        = $(COPY) -r
-QMAKE_MOVE            = mv -f
-QMAKE_DEL_FILE        = rm -f
-QMAKE_DEL_DIR         = rmdir
 QMAKE_STRIP           = strip
 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS  = test -d
-QMAKE_MKDIR           = mkdir -p
 QMAKE_INSTALL_FILE    = install -m 644 -p
 QMAKE_INSTALL_PROGRAM = install -m 755 -p
 

mkspecs/unsupported/win32-borland/qmake.conf

@@ -42,8 +42,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -x-
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		= $(BCB)\\lib
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $<
@@ -73,14 +71,5 @@ QMAKE_IDL		= midl
 QMAKE_LIB		= tlib /C /P256
 QMAKE_RC		= brcc32 -dQ_CC_BOR
 
-QMAKE_ZIP		= zip -r -9
+include(../../common/shell-win32.conf)
-
-QMAKE_COPY		= copy /y
-QMAKE_COPY_DIR		= xcopy /s /q /y /i
-QMAKE_MOVE		= move
-QMAKE_DEL_FILE		= del
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= if not exist
-QMAKE_MKDIR		= mkdir
-
 load(qt_config)

mkspecs/unsupported/win32-g++-cross/qmake.conf

@@ -51,8 +51,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 
 QMAKE_INCDIR		=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
@@ -83,24 +81,14 @@ QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2
 QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
 
 QMAKE_SH		= bash
-
 MINGW_IN_SHELL		= 1
-QMAKE_DIR_SEP		= /
+include(../../common/shell-unix.conf)
-QMAKE_COPY		= cp
-QMAKE_STREAM_EDITOR     = sed
-QMAKE_COPY_DIR		= cp -R
-QMAKE_MOVE		= mv
-QMAKE_DEL_FILE		= rm -f
-QMAKE_MKDIR		= mkdir -p
-QMAKE_DEL_DIR		= rmdir
-QMAKE_SYMBOLIC_LINK	= ln -s
-QMAKE_CHK_DIR_EXISTS	= test -d
 
 QMAKE_LIB		= i686-pc-mingw32-ar -ru
 QMAKE_RC		= i686-pc-mingw32-windres
-QMAKE_ZIP		= zip -r -9
 
 QMAKE_STRIP		= i686-pc-mingw32-strip
 QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
 PKG_CONFIG		= i686-pc-mingw32-pkg-config
+
 load(qt_config)

mkspecs/unsupported/win32-msvc2003/qmake.conf

@@ -40,8 +40,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR            =
-QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
@@ -71,15 +69,7 @@ QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc
 
-QMAKE_ZIP               = zip -r -9
+include(../../common/shell-win32.conf)
-
-QMAKE_COPY              = copy /y
-QMAKE_COPY_DIR          = xcopy /s /q /y /i
-QMAKE_MOVE              = move
-QMAKE_DEL_FILE          = del
-QMAKE_DEL_DIR           = rmdir
-QMAKE_CHK_DIR_EXISTS    = if not exist
-QMAKE_MKDIR             = mkdir
 
 VCPROJ_EXTENSION        = .vcproj
 VCSOLUTION_EXTENSION    = .sln

mkspecs/win32-g++/qmake.conf

@@ -51,8 +51,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 
 QMAKE_INCDIR		=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
@@ -85,29 +83,14 @@ QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
 !isEmpty(QMAKE_SH) {
     MINGW_IN_SHELL      = 1
 	QMAKE_DIR_SEP		= /
-	QMAKE_QMAKE		~= s,\\\\,/,
+    include(../common/shell-unix.conf)
-	QMAKE_COPY		= cp
-        QMAKE_STREAM_EDITOR     = sed
-	QMAKE_COPY_DIR		= cp -r
-	QMAKE_MOVE		= mv
-	QMAKE_DEL_FILE		= rm
-	QMAKE_MKDIR		= mkdir -p
-	QMAKE_DEL_DIR		= rmdir
-    QMAKE_CHK_DIR_EXISTS = test -d
 } else {
-	QMAKE_COPY		= copy /y
+    include(../common/shell-win32.conf)
-	QMAKE_COPY_DIR		= xcopy /s /q /y /i
-	QMAKE_MOVE		= move
-	QMAKE_DEL_FILE		= del
-	QMAKE_MKDIR		= mkdir
-	QMAKE_DEL_DIR		= rmdir
-    QMAKE_CHK_DIR_EXISTS	= if not exist
 }
 
 QMAKE_IDL		= midl
 QMAKE_LIB		= ar -ru
 QMAKE_RC		= windres
-QMAKE_ZIP		= zip -r -9
 
 QMAKE_STRIP		= strip
 QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded

mkspecs/win32-icc/qmake.conf

@@ -40,8 +40,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -GX
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR		=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
@@ -71,15 +69,7 @@ QMAKE_IDL		= midl
 QMAKE_LIB		= xilib /NOLOGO
 QMAKE_RC		= rc
 
-QMAKE_ZIP		= zip -r -9
+include(../common/shell-win32.conf)
-
-QMAKE_COPY		= copy /y
-QMAKE_COPY_DIR		= xcopy /s /q /y /i
-QMAKE_MOVE		= move
-QMAKE_DEL_FILE		= del
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= if not exist
-QMAKE_MKDIR		= mkdir
 
 DSP_EXTENSION		= .dsp
 load(qt_config)

mkspecs/win32-msvc11/qmake.conf

@@ -85,15 +85,7 @@ QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc
 
-QMAKE_ZIP               = zip -r -9
+include(../common/shell-win32.conf)
-
-QMAKE_COPY              = copy /y
-QMAKE_COPY_DIR          = xcopy /s /q /y /i
-QMAKE_MOVE              = move
-QMAKE_DEL_FILE          = del
-QMAKE_DEL_DIR           = rmdir
-QMAKE_CHK_DIR_EXISTS    = if not exist
-QMAKE_MKDIR             = mkdir
 
 VCPROJ_EXTENSION        = .vcxproj
 VCSOLUTION_EXTENSION    = .sln

mkspecs/win32-msvc2005/qmake.conf

@@ -47,8 +47,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR            =
-QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
@@ -81,15 +79,7 @@ QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc
 
-QMAKE_ZIP               = zip -r -9
+include(../common/shell-win32.conf)
-
-QMAKE_COPY              = copy /y
-QMAKE_COPY_DIR          = xcopy /s /q /y /i
-QMAKE_MOVE              = move
-QMAKE_DEL_FILE          = del
-QMAKE_DEL_DIR           = rmdir
-QMAKE_CHK_DIR_EXISTS    = if not exist
-QMAKE_MKDIR             = mkdir
 
 VCPROJ_EXTENSION        = .vcproj
 VCSOLUTION_EXTENSION    = .sln

mkspecs/win32-msvc2008/qmake.conf

@@ -49,8 +49,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR            =
-QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
@@ -83,15 +81,7 @@ QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc
 
-QMAKE_ZIP               = zip -r -9
+include(../common/shell-win32.conf)
-
-QMAKE_COPY              = copy /y
-QMAKE_COPY_DIR          = xcopy /s /q /y /i
-QMAKE_MOVE              = move
-QMAKE_DEL_FILE          = del
-QMAKE_DEL_DIR           = rmdir
-QMAKE_CHK_DIR_EXISTS    = if not exist
-QMAKE_MKDIR             = mkdir
 
 VCPROJ_EXTENSION        = .vcproj
 VCSOLUTION_EXTENSION    = .sln

mkspecs/win32-msvc2010/qmake.conf

@@ -51,8 +51,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR            =
-QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
 
 QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
 QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
@@ -85,15 +83,7 @@ QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc
 
-QMAKE_ZIP               = zip -r -9
+include(../common/shell-win32.conf)
-
-QMAKE_COPY              = copy /y
-QMAKE_COPY_DIR          = xcopy /s /q /y /i
-QMAKE_MOVE              = move
-QMAKE_DEL_FILE          = del
-QMAKE_DEL_DIR           = rmdir
-QMAKE_CHK_DIR_EXISTS    = if not exist
-QMAKE_MKDIR             = mkdir
 
 VCPROJ_EXTENSION        = .vcxproj
 VCSOLUTION_EXTENSION    = .sln

qmake/Makefile.unix

@@ -13,7 +13,7 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o  \
      mingw_make.o option.o winmakefile.o projectgenerator.o \
      meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
      borland_bmake.o msvc_vcproj.o msvc_vcxproj.o msvc_nmake.o msvc_objectmodel.o msbuild_objectmodel.o \
-     gbuild.o
+     gbuild.o cesdkhandler.o
 
 #qt code
 QOBJS=qtextcodec.o qutfcodec.o qstring.o qstringbuilder.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \
@@ -36,7 +36,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
 	   generators/mac/pbuilder_pbx.cpp generators/mac/xmloutput.cpp generators/metamakefile.cpp \
 	   generators/makefiledeps.cpp option.cpp generators/win32/mingw_make.cpp generators/makefile.cpp \
 	   generators/win32/msvc_vcproj.cpp generators/win32/msvc_vcxproj.cpp generators/win32/msvc_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
-	   generators/integrity/gbuild.cpp \
+	   generators/integrity/gbuild.cpp generators/win32/cesdkhandler.cpp \
 	   $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \
 	   $(SOURCE_PATH)/src/corelib/io/qfiledevice.cpp \
@@ -160,6 +160,9 @@ msvc_vcxproj.o: $(QMKSRC)/generators/win32/msvc_vcxproj.cpp
 msvc_nmake.o: $(QMKSRC)/generators/win32/msvc_nmake.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
+cesdkhandler.o: $(QMKSRC)/generators/win32/cesdkhandler.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) $<
+
 pbuilder_pbx.o: $(QMKSRC)/generators/mac/pbuilder_pbx.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<