Fix make install with WebKit

Avoid running "make install" through build-webkit and therefore risk
accidentally rebuilding the lot. We call build-webkit either with --release
or without, but we never pass --debug. Therefore the build directory is
always WebKitBuild/Release.

This is a stop-gap for the Qt 5 beta. After the release we'll get rid of
qtwebkit.pri altogether and WebKit will be built with just qmake and make.

Change-Id: I21ff7ef8420b67cf466d5bca5efd7a1245bf4131
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

.gitignore

@@ -1,259 +1,3 @@
-# This file is used to ignore files which are generated in the Qt build system
-# ----------------------------------------------------------------------------
-
-examples/*/*/*
-!examples/*/*/*[.]*
-!examples/*/*/README
-examples/*/*/*[.]app
-!examples/declarative/*
-!examples/tutorials/*
-!examples/tutorials/*/*
-!examples/ja_JP/*/*
-demos/*/*
-!demos/spectrum/*
-demos/spectrum/bin
-!demos/*/*[.]*
-demos/*/*[.]app
-!demos/declarative/*
-config.tests/*/*/*
-!config.tests/*/*/*[.]*
-config.tests/*/*/*[.]app
-
-callgrind.out.*
-pcviewer.cfg
-*~
-*.a
-*.la
-*.core
-*.moc
-*.o
-*.obj
-*.orig
-*.swp
-*.rej
-*.so
-*.pbxuser
-*.mode1
-*.mode1v3
-*_pch.h.cpp
-*_resource.rc
-.#*
-*.*#
-core
+Makefile
+Makefile.qtwebkit
 .qmake.cache
-.qmake.vars
-*.prl
-tags
-.DS_Store
-*.debug
-Makefile*
-!qmake/Makefile.win32*
-!qmake/Makefile.unix
-*.prl
-*.app
-*.pro.user
-*.qmlproject.user
-*.gcov
-bin/Qt*.dll
-bin/assistant*
-bin/designer*
-bin/dumpcpp*
-bin/idc*
-bin/linguist*
-bin/lrelease*
-bin/lupdate*
-bin/lconvert*
-bin/moc*
-bin/makeqpf*
-bin/pixeltool*
-bin/qmake*
-bin/qdoc3*
-bin/qt3to4*
-bin/qtdemo*
-bin/qttracereplay*
-bin/rcc*
-bin/uic*
-bin/patternist*
-bin/phonon*
-bin/qcollectiongenerator*
-bin/qdbus*
-bin/qhelpconverter*
-bin/qhelpgenerator*
-bin/qtconfig*
-bin/xmlpatterns*
-bin/cetest*
-bin/collectiongenerator
-bin/helpconverter
-bin/helpgenerator
-bin/kmap2qmap*
-bin/qlalr*
-bin/qmlconv*
-bin/qmldebugger*
-bin/qml*
-bin/qttracereplay*
-configure.cache
-config.status
-mkspecs/default
-mkspecs/qconfig.pri
-moc_*.cpp
-qmake/qmake.exe
-qmake/Makefile.bak
-src/corelib/global/qconfig.cpp
-src/corelib/global/qconfig.h
-src/corelib/global/qconfig.h.qmake
-ui_*.h
-tests/auto/qprocess/test*/*.exe
-tests/auto/qtcpsocket/stressTest/*.exe
-tests/auto/qprocess/fileWriterProcess/*.exe
-tests/auto/qmake/testdata/quotedfilenames/*.exe
-tests/auto/compilerwarnings/*.exe
-tests/auto/qmake/testdata/quotedfilenames/test.cpp
-tests/auto/qprocess/fileWriterProcess.txt
-.com.apple.timemachine.supported
-tests/auto/qlibrary/libmylib.so*
-tests/auto/qresourceengine/runtime_resource.rcc
-tools/activeqt/testcon/testcon.tlb
-translations/*.qm
-translations/*_untranslated.ts
-qrc_*.cpp
-
-# Test generated files
-QObject.log
-tst_*
-!tst_*.*
-tst_*.log
-tst_*.debug
-tst_*~
-
-# xemacs temporary files
-*.flc
-
-# Vim temporary files
-.*.swp
-
-# Visual Studio generated files
-*.ib_pdb_index
-*.idb
-*.ilk
-*.pdb
-*.sln
-*.suo
-*.vcproj
-*vcproj.*.*.user
-*.ncb
-*.vcxproj
-*.vcxproj.filters
-*.vcxproj.user
-
-# MinGW generated files
-*.Debug
-*.Release
-
-# WebKit temp files
-src/3rdparty/webkit/WebCore/mocinclude.tmp
-src/3rdparty/webkit/includes.txt
-src/3rdparty/webkit/includes2.txt
-
-# Symlinks generated by configure
-tools/qvfb/qvfbhdr.h
-tools/qvfb/qlock_p.h
-tools/qvfb/qlock.cpp
-tools/qvfb/qwssignalhandler.cpp
-tools/qvfb/qwssignalhandler_p.h
-.DS_Store
-.pch
-.rcc
-*.app
-config.status
-config.tests/unix/cups/cups
-config.tests/unix/getaddrinfo/getaddrinfo
-config.tests/unix/getifaddrs/getifaddrs
-config.tests/unix/iconv/iconv
-config.tests/unix/ipv6/ipv6
-config.tests/unix/ipv6ifname/ipv6ifname
-config.tests/unix/largefile/largefile
-config.tests/unix/nis/nis
-config.tests/unix/odbc/odbc
-config.tests/unix/openssl/openssl
-config.tests/unix/stl/stl
-config.tests/unix/zlib/zlib
-config.tests/unix/3dnow/3dnow
-config.tests/unix/mmx/mmx
-config.tests/unix/sse/sse
-config.tests/unix/sse2/sse2
-
-
-
-# Directories to ignore
-# ---------------------
-
-debug
-examples/tools/plugandpaint/plugins
-include/*
-include/*/*
-lib/*
-!lib/fonts
-!lib/README
-plugins/*/*
-release
-tmp
-doc-build
-doc/html/*
-doc/qch
-doc-build
-.rcc
-.pch
-.metadata
-
-# Symbian build system generated files
-# ---------------------
-
-ABLD.BAT
-bld.inf*
-*.mmp
-*.mk
-*.rss
-*.loc
-!s60main.rss
-*.pkg
-plugin_commonu.def
-*.qtplugin
-*.sis
-*.sisx
-*.lst
-*.exe
-*.mif
-*.rsc
-*.sym
-*.lib
-
-# runonphone crash dumps
-d_exc_*.txt
-d_exc_*.stk
-
-# Generated by abldfast.bat from devtools.
-.abldsteps.*
-
-# Carbide project files
-# ---------------------
-.project
-.cproject
-.make.cache
-*.d
-
-qtc-debugging-helper
-src/corelib/lib
-src/network/lib
-src/xml/lib/
-
-.pc/
-
-# INTEGRITY generated files
-*.gpj
-*.int
-*.ael
-*.dla
-*.dnm
-*.dep
-*.map
-work

.gitmodules

@@ -7,6 +7,9 @@
 [submodule "qtdeclarative"]
 	path = qtdeclarative
 	url = git://gitorious.org/qt/qtdeclarative.git
+[submodule "qtactiveqt"]
+	path = qtactiveqt
+	url = git://gitorious.org/qt/qtactiveqt.git
 [submodule "qtscript"]
 	path = qtscript
 	url = git://gitorious.org/qt/qtscript.git
@@ -19,12 +22,24 @@
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
 	url = git://gitorious.org/qt/qtxmlpatterns.git
+[submodule "qttranslations"]
+	path = qttranslations
+	url = git://gitorious.org/qt/qttranslations.git
 [submodule "qtdoc"]
 	path = qtdoc
 	url = git://gitorious.org/qt/qtdoc.git
+[submodule "qlalr"]
+	path = qlalr
+	url = git://gitorious.org/qt/qlalr.git
+[submodule "qtrepotools"]
+	path = qtrepotools
+	url = git://gitorious.org/qt/qtrepotools.git
 [submodule "qtwebkit-examples-and-demos"]
 	path = qtwebkit-examples-and-demos
 	url = git://gitorious.org/qt/qtwebkit-examples-and-demos.git
+[submodule "qtqa"]
+	path = qtqa
+	url = git://gitorious.org/qt/qtqa.git
 [submodule "qtwebkit"]
 	path = qtwebkit
 	url = git://gitorious.org/qtwebkit/qt5-module.git
@@ -37,6 +52,15 @@
 [submodule "qtsystems"]
 	path = qtsystems
 	url = git://gitorious.org/qt/qtsystems.git
+[submodule "qtfeedback"]
+	path = qtfeedback
+	url = git://gitorious.org/qt/qtfeedback.git
+[submodule "qtpim"]
+	path = qtpim
+	url = git://gitorious.org/qt/qtpim.git
+[submodule "qtconnectivity"]
+	path = qtconnectivity
+	url = git://gitorious.org/qt/qtconnectivity.git
 [submodule "qtwayland"]
 	path = qtwayland
 	url = git://gitorious.org/qt/qtwayland.git

README

@@ -82,7 +82,7 @@ HOW TO BUILD QT5
  ==================
 
  Obtaining the source code is described in detail at
- http://wiki.qt-project.org/Main_Page and
+ http://qt-project.org/wiki/Category:Developing_Qt and
  http://qt-project.org/wiki/Get_The_Source.
 
  Cloning Qt5 does not automatically clone all submodules.

build

@@ -46,6 +46,73 @@ use warnings;
 
 package Qt::Build;
 
+=head1 NAME
+
+build - builds the Qt5 repository with all submodules in order
+
+=head1 SYNOPSIS
+
+B<build> [B<-v>|B<--verbose> [n]] [B<-c>|B<--continue> [n]] [B<-j>|B<--jobs> [n]] [B<-n>|B<--dry-run> [n]] [B<--force-qmake>] [modules to build]
+
+=head1 DESCRIPTION
+
+This script is used to build all the Qt modules in the correct order. The way of building the Qt
+modules is fairly complex, since they need to both be built and installed in the proper order, if
+configured prefix happens to be in a different location than the build directory of QtBase.
+
+It's not enough to do first a top-level 'make', then a 'make install', since modules would then no
+be available to the consecutive modules. The build script also handles a situation where Jom
+exposes a dependency bug with parallel builds, by doing a 'qmake -r' on each individual module as
+part of each modules build process.
+
+If no modules to build are passed on the command-line, all the default modules will be built.
+
+=head1 OPTIONS
+
+=over
+
+=item  B<-v> [n], B<--verbose> [n]
+
+Makes output more verbose. Level of verboseness optional (default: 1).
+
+=item B<-c> [n], B<--continue> [n]
+
+Ignore failed submodules, and continue building. Continue has levels (default: 1). The default
+level will make the build script ignore any errors in a submodule, and continue to build the next
+dependency. Level 2 means that the --keep-going option is also passed to make for each submodule.
+
+=item B<-j> [n], B<--jobs> [n]
+
+Sets the number of parallel builds. Number is optional, but providing no number indicates
+Unlimited, which you most likely do not want.
+
+=item B<--force-qmake>
+
+Forces a 'qmake -r' on a module, even if the build script detects an already existing Makefile in
+the module.
+
+=item B<-n> [n], B<--dry-run> [n]
+
+Does a dry-run, show which actions will be taken without actually performing them. Dry-run has
+levels (default: 1). The default level only shows which commands this script will execute. Level 2
+will also do a dry-run on make, showing all the actions the build-script will result in. Level 2
+requires C<qmake -r> to run, so it is not completely "dry" in its purest sense, although nothing is
+built.
+
+=back
+
+=head1 COPYRIGHT
+
+Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+Contact: http://www.qt-project.org/
+
+=head1 LICENSE
+
+This file is part of the utilities of the Qt Toolkit, and may be used under the terms of the GNU
+Lesser General Public (LGPL 2.1), or the GNU General Public License (GPL 3.0)
+
+=cut
+
 use Carp         qw( confess             );
 use English      qw( -no_match_vars      );
 use Getopt::Long qw( GetOptionsFromArray );
@@ -54,6 +121,33 @@ use Cwd          qw( getcwd              );
 use File::Spec   qw( path catfile        );
 use Config;
 
+sub parse_arguments
+{
+    my ($self, @args) = @_;
+
+    %{$self} = (%{$self},
+        'verbose'             => 0,
+        'continue'            => 0,
+        'jobs'                => -1,
+        'force_qmake'         => 0,
+        'build-submodules'    => [],
+        'dry-run'             => 0,
+    );
+
+    GetOptionsFromArray(\@args,
+        'verbose|v:1'   =>  \$self->{'verbose'},
+        'continue|c:1'  =>  \$self->{'continue'},
+        'jobs|j:0'      =>  \$self->{'jobs'},
+        'force-qmake'   =>  \$self->{'force_qmake'},
+        'dry-run|n:1'   =>  \$self->{'dry-run'},
+        'help|?'        =>  sub { pod2usage(1); },
+    ) || pod2usage(2);
+
+    push(@{$self->{'build-submodules'}}, @args) if (@args);
+
+    return;
+}
+
 # Like `system', but possibly log the command, and die on non-zero exit code
 sub exe
 {
@@ -61,11 +155,10 @@ sub exe
 
     print "+ @cmd\n" unless ($self->{quiet});
 
-    if (system(@cmd) != 0) {
-        confess "@cmd exited with status $CHILD_ERROR";
+    # dry-run > 1 means run sub-processes with dry-run too
+    if ($self->{'dry-run'} != 1) {
+        confess "@cmd exited with status $CHILD_ERROR" if (system(@cmd) != 0);
     }
-
-    return 0;
 }
 
 sub dropPrivileges()
@@ -95,85 +188,33 @@ sub dropPrivileges()
 sub exeHighPriv()
 {
     my ($self, @cmd) = @_;
-    return $self->exe(@cmd);
+    # confesses upon system() failure
+    $self->exe(@cmd);
 }
 
 sub exeLowPriv()
 {
     my ($self, @cmd) = @_;
 
-    if ("$Config{osname}" =~ /mswin/i) {
-        # Just like exeHighPriv for now
-        return $self->exe(@cmd);
-    } else {
+    if ("$Config{osname}" !~ /mswin/i) {
         my $ret;
         my $pid = fork();
         die "Couldn't fork" unless defined $pid;
         if ($pid == 0) {
             $self->dropPrivileges;
-            $self->exe(@cmd);
-            exit 0;
+            # just exit on error, exception propagated below
+            eval { $self->exe(@cmd); };
+            exit $?;
         } else {
             waitpid($pid, 0);
-            return $?;
+            # propagate exception upon system() failure in fork
+            die if ($? != 0);
+            return;
         }
     }
-}
 
-sub new
-{
-    my ($class, @arguments) = @_;
-
-    my $self = {};
-    bless $self, $class;
-
-    $self->parse_arguments(@arguments);
-    $self->detect_configuration;
-
-    my $depfile = "build.dependencies";
-    my $result;
-    our (%build_dependencies, %build_commands, %install_commands, @nondefault_modules);
-
-    # following variables may be expanded in the evaluation below
-    my $MAKEOPTS = $self->{'MAKEOPTS'};
-    my $MAKE = $self->{'MAKE'};
-
-    unless ($result = do $depfile) {
-        die "build couldn't parse $depfile: $@" if $@;
-        die "build couldn't execute $depfile: $!" unless defined $result;
-    }
-
-    $self->{'deps'} = \%build_dependencies;
-    $self->{'buildcmds'} = \%build_commands;
-    $self->{'instcmds'} = \%install_commands;
-    $self->{'nondefault'} = \@nondefault_modules;
-
-    return $self;
-}
-
-sub parse_arguments
-{
-    my ($self, @args) = @_;
-
-    %{$self} = (%{$self},
-        'verbose'             => 0,
-        'continue'            => 0,
-        'jobs'                => -1,
-        'force_qmake'         => 0,
-        'build-submodules'    => [],
-    );
-
-    GetOptionsFromArray(\@args,
-        'verbose|v:1'   =>  \$self->{'verbose'},
-        'continue'      =>  \$self->{'continue'},
-        'jobs|j:1'      =>  \$self->{'jobs'},
-        'force-qmake'   =>  \$self->{'force_qmake'},
-        'help|?'        =>  sub { pod2usage(1); },
-    ) || pod2usage(2);
-
-    push(@{$self->{'build-submodules'}}, @args) if (@args);
-
-    return;
+    # Just like exeHighPriv for now, and confesses upon failure
+    $self->exe(@cmd);
 }
 
 sub which {
@@ -198,11 +239,10 @@ sub detect_configuration
     my $abs_path = abs_path('qtbase/bin');
     unshift @PATH, $abs_path;
 
-    if ($self->{'jobs'} >= 0) {
-        $self->{'MAKEOPTS'} = "-j $self->{'jobs'}";
-    } else {
-        $self->{'MAKEOPTS'} = "";
-    }
+    my $opts = "";
+    $opts = "-j" if ($self->{'jobs'} >= 0);
+    $opts .= " $self->{'jobs'}" if ($self->{'jobs'} > 0);
+    $self->{'MAKEOPTS'} = $opts;
     $self->{'MAKE'} = $ENV{MAKE} || "make";
 
     if ("$Config{osname}" =~ /mswin/i) {
@@ -210,19 +250,39 @@ sub detect_configuration
         $exe = $self->which("jom.exe") if (defined $exe && $self->which("jom.exe"));
         $exe = $self->which("mingw32-make.exe") if (!defined $exe);
 
-         # Use the /MP compiler option, if using nmake, to use all CPU threads when compiling
-        if ($exe =~ 'nmake') {
-            use Env qw(@CL);
-            unshift @CL, '/MP';
-        }
+        if (defined $exe) {
+            $self->{'MAKE'} = "\"$exe\"";
 
-        $self->{'MAKE'} = "\"$exe\"" if (defined $exe);
-        $self->{'MAKEOPTS'} = "" if (defined $exe && $exe =~ /nmake/);
+            if ($exe =~ 'nmake') {
+                # Use the /MP compiler option if using nmake, to use all CPU threads when compiling
+                my $cl = $ENV{'CL'};
+                if (defined $cl) {
+                    $cl .= ' /MP';
+                } else {
+                    $cl = '/MP';
+                }
+                $ENV{'CL'} = $cl;
+                # Remove the -j option, since nmake cannot handle it.
+                $self->{'MAKEOPTS'} = "";
+            } elsif ($exe =~ 'jom' && $self->{'jobs'} == 0) {
+                # Jom currently doesn't handle the -j (unlimited) option, so remove it.
+                $self->{'MAKEOPTS'} = "";
+            }
+
+            if ($exe =~ 'nmake|jom') {
+                $self->{'MAKEOPTS'} = "/N $self->{'MAKEOPTS'}" if ($self->{'dry-run'} > 1);
+                $self->{'MAKEOPTS'} = "/K $self->{'MAKEOPTS'}" if ($self->{'continue'} > 1);
+            }
+        }
 
         # Tools needed for building QtWebKit/Windows (Bison, Flex, gperf, iconv)
         my $abs_path = abs_path('gnuwin32/bin');
         unshift @PATH, "$abs_path";
     }
+    if ($self->{'MAKE'} !~ "nmake|jom") {
+        $self->{'MAKEOPTS'} = "--dry-run $self->{'MAKEOPTS'}" if ($self->{'dry-run'} > 1);
+        $self->{'MAKEOPTS'} = "--keep-going $self->{'MAKEOPTS'}" if ($self->{'continue'} > 1);
+    }
 }
 
 sub find_pro_file
@@ -370,15 +430,31 @@ sub build_project
     my $install_command = $self->{'instcmds'}->{$module};
     if (!defined $build_command) {
         if (!-e "$module/Makefile") {
-            $self->exeLowPriv("cd $module && qmake -r") && die "'cd $module && $build_command' failed: $?";
+            $self->exeLowPriv("cd $module && qmake -r");
+        }
+        $build_command = "$self->{MAKE} $self->{MAKEOPTS}";
+    }
+    eval { $self->exeLowPriv("cd $module && $build_command"); };
+    if ($@) {
+        print STDERR "'cd $module && $build_command' failed: $?\n";
+        if ($self->{'continue'}) {
+            print STDERR "Ignoring failure building $module (--continue)\n";
+        } else {
+            confess "Fatal failure building $module";
         }
-        $build_command = "$self->{MAKE} $self->{MAKEOPTS}" if (!defined $build_command);
     }
-    $self->exeLowPriv("cd $module && $build_command") && die "'cd $module && $build_command' failed: $?";
     $install_command = "$self->{MAKE} install" if (!defined $install_command);
     ### TODO: Should be fixed after the alpha
     unless ("$Config{osname}" =~ /(dar|ms)win/i) {
-        $self->exeHighPriv("cd $module && $install_command") && die "'cd $module && $install_command failed: $?";
+        eval { $self->exeHighPriv("cd $module && $install_command"); };
+        if ($@) {
+            print STDERR "'cd $module && $install_command failed: $?\n";
+            if ($self->{'continue'}) {
+                print STDERR "Ignoring failure installing $module (--continue)\n";
+            } else {
+                confess "Fatal failure installing $module";
+            }
+        }
     }
     $self->mark_as_finished($module);
     return 0;
@@ -414,6 +490,37 @@ sub build_qt
     return 0;
 }
 
+sub new
+{
+    my ($class, @arguments) = @_;
+
+    my $self = {};
+    bless $self, $class;
+
+    $self->parse_arguments(@arguments);
+    $self->detect_configuration;
+
+    my $depfile = "build.dependencies";
+    my $result;
+    our (%build_dependencies, %build_commands, %install_commands, @nondefault_modules);
+
+    # following variables may be expanded in the evaluation below
+    my $MAKEOPTS = $self->{'MAKEOPTS'};
+    my $MAKE = $self->{'MAKE'};
+
+    unless ($result = do $depfile) {
+        die "build couldn't parse $depfile: $@" if $@;
+        die "build couldn't execute $depfile: $!" unless defined $result;
+    }
+
+    $self->{'deps'} = \%build_dependencies;
+    $self->{'buildcmds'} = \%build_commands;
+    $self->{'instcmds'} = \%install_commands;
+    $self->{'nondefault'} = \@nondefault_modules;
+
+    return $self;
+}
+
 sub run
 {
     my ($self) = @_;

build.dependencies

@@ -11,25 +11,22 @@ use Config;
     "qt3d" => "qtbase,qtdeclarative",
     "qtbase" => "",
     "qtconnectivity" => "qtsystems",
-    "qtdeclarative" => "qtbase,qtxmlpatterns,qtjsbackend,qtsvg:s",
+    "qtdeclarative" => "qtbase,qtxmlpatterns,qtjsbackend",
     "qtdoc" => "qtbase,qtdeclarative",
-    "qtdocgallery" => "qtbase,qtscript,qtdeclarative,qtjsondb:s",
     "qtfeedback" => "qtbase,qtmultimedia,qtdeclarative",
-    "qtgraphicaleffects" => "qtbase,qtdeclarative,qtsvg,qtxmlpatterns",
+    "qtgraphicaleffects" => "qtbase,qtdeclarative,qtxmlpatterns",
     "qtimageformats" => "qtbase",
     "qtjsbackend" => "qtbase",
-    "qtjsondb" => "qtbase,qtdeclarative,qtxmlpatterns",
-    "qtlocation" => "qtbase,qtdeclarative,qt3d,qtjsondb:s",
+    "qtlocation" => "qtbase,qtdeclarative,qt3d",
     "qtmultimedia" => "qtbase,qtdeclarative",
-    "qtphonon" => "qtbase",
-    "qtpim" => "qtdeclarative,qtjsondb:s",
+    "qtpim" => "qtdeclarative",
     "qtqa" => "qtbase",
-    "qtquick1" => "qtbase,qtscript,qtxmlpatterns,qtsvg:s",
+    "qtquick1" => "qtbase,qtscript,qtxmlpatterns,qttools,qtsvg:s",
     "qtscript" => "qtbase",
     "qtsensors" => "qtbase,qtdeclarative",
     "qtsvg" => "qtbase",
-    "qtsystems" => "qtbase,qtdeclarative,qtjsondb:s",
-    "qttools" => "qtbase,qtscript,qtdeclarative,qtquick1,qtwebkit:s",
+    "qtsystems" => "qtbase,qtdeclarative",
+    "qttools" => "qtbase,qtdeclarative,qtwebkit:s",
     "qttranslations" => "qttools",
     "qtwebkit" => "qtbase,qtscript,qtdeclarative,qtquick1,qtlocation",
     "qtwebkit-examples-and-demos" => "qtwebkit",

configure

@@ -95,7 +95,10 @@ if (-e ".qmake.cache") {
     unlink ".qmake.cache";
 }
 my $ret = system_v("$relpath/qtbase/configure @ARGV");
-exit ($ret>>8) unless ($ret == 0);
+if ($ret != 0) {
+    print "*** qtbase/configure exited with non-zero status.\n";
+    exit ($ret>>8) ;
+}
 if (! -e ".qmake.cache") {
     # Even though there was no error code, this file wasn't created
     # so configure didn't finish properly. This is probably because
@@ -105,9 +108,5 @@ if (! -e ".qmake.cache") {
 
 chdir("$outpath");
 
-open QMAKE_CACHE, ">.qmake.cache" || die "Could not open .qmake.cache for writing!\n";
-print QMAKE_CACHE "include(\$\$PWD/qtbase/.qmake.cache)\n";
-close QMAKE_CACHE;
-
 $ret = system_v("$outpath/qtbase/bin/qmake $relpath/qt.pro");
 exit ($ret>>8);

init-repository

@@ -192,7 +192,7 @@ For example:
 
 ...will use the following as a mirror for qtbase:
 
-  user@machine:/foo/bar/qtbase.git
+  user@machine:/foo/bar/qt/qtbase.git
 
 The mirror is permitted to contain a subset of the submodules; any
 missing modules will fall back to the canonical URLs.
@@ -226,15 +226,12 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtconnectivity
     qtdeclarative
     qtdoc
-    qtdocgallery
     qtfeedback
     qtgraphicaleffects
     qtimageformats
-    qtjsondb
     qtjsbackend
     qtlocation
     qtmultimedia
-    qtphonon
     qtpim
     qtqa
     qtquick1
@@ -454,7 +451,7 @@ sub git_set_submodule_config
 
         if ($protocol) {
             # WebKit is special, and has only external link.
-            if ($key ne 'qtwebkit') {
+            if (!($key eq 'qtwebkit' && $protocol eq 'internal')) {
                 # qt-labs projects are still hosted under qt internally.
                 if ($protocol ne 'http') {
                     $value =~ s,^git://gitorious\.org/qt-labs/,${url_base_for_protocol}qt/,;
@@ -516,7 +513,7 @@ sub git_add_remotes
 
         $gerrit_repo_url .= $gerrit_repo_basename;
         $self->exe('git', 'config', 'remote.gerrit.url', $gerrit_repo_url);
-        $self->exe('git', 'config', 'remote.gerrit.fetch', '+refs/heads/*:refs/remotes/gerrit/*');
+        $self->exe('git', 'config', 'remote.gerrit.fetch', '+refs/heads/*:refs/remotes/gerrit/*', '/heads/');
     }
 
     return;

qt.pro

@@ -1,128 +1,117 @@
+# Create the super cache so modules will add themselves to it.
+cache(, super)
+
 TEMPLATE      = subdirs
 
-module_qtbase.subdir = $$IN_PWD/qtbase
+module_qtbase.subdir = qtbase
 module_qtbase.target = module-qtbase
 
-module_qtsvg.subdir = $$IN_PWD/qtsvg
+module_qtsvg.subdir = qtsvg
 module_qtsvg.target = module-qtsvg
 module_qtsvg.depends = module_qtbase
 
-module_qtphonon.subdir = $$IN_PWD/qtphonon
-module_qtphonon.target = module-qtphonon
-module_qtphonon.depends = module_qtbase
-
-module_qtxmlpatterns.subdir = $$IN_PWD/qtxmlpatterns
+module_qtxmlpatterns.subdir = qtxmlpatterns
 module_qtxmlpatterns.target = module-qtxmlpatterns
 module_qtxmlpatterns.depends = module_qtbase
 
-module_qtscript.subdir = $$IN_PWD/qtscript
+module_qtscript.subdir = qtscript
 module_qtscript.target = module-qtscript
 module_qtscript.depends = module_qtbase
 
-module_qtjsbackend.subdir = $$IN_PWD/qtjsbackend
+module_qtjsbackend.subdir = qtjsbackend
 module_qtjsbackend.target = module-qtjsbackend
 module_qtjsbackend.depends = module_qtbase
 
-module_qtdeclarative.subdir = $$IN_PWD/qtdeclarative
+module_qtdeclarative.subdir = qtdeclarative
 module_qtdeclarative.target = module-qtdeclarative
-module_qtdeclarative.depends = module_qtbase module_qtxmlpatterns module_qtjsbackend
+module_qtdeclarative.depends = module_qtbase module_qtjsbackend
 
 module_qtwebkit.file = qtwebkit.pri
 module_qtwebkit.makefile = Makefile.qtwebkit
-module_qtwebkit.depends = module_qtbase module_qtscript module_qtdeclarative module_qtquick1
+module_qtwebkit.depends = module_qtbase module_qtdeclarative
 # The qtwebkit subdir does not follow the "module-*" scheme, so make our own target that does.
 module_qtwebkit_target.target = module-qtwebkit
 module_qtwebkit_target.commands =
 module_qtwebkit_target.depends = sub-qtwebkit-pri
 QMAKE_EXTRA_TARGETS += module_qtwebkit_target
 
-module_qtwebkit_examples_and_demos.subdir = $$IN_PWD/qtwebkit-examples-and-demos
+module_qtwebkit_examples_and_demos.subdir = qtwebkit-examples-and-demos
 module_qtwebkit_examples_and_demos.target = module-qtwebkit-examples-and-demos
-module_qtwebkit_examples_and_demos.depends = module_qtwebkit
+module_qtwebkit_examples_and_demos.depends = module_qtwebkit module_qttools
 
-module_qttools.subdir = $$IN_PWD/qttools
+module_qttools.subdir = qttools
 module_qttools.target = module-qttools
-module_qttools.depends = module_qtbase module_qtscript module_qtquick1 module_qtdeclarative
+module_qttools.depends = module_qtbase module_qtdeclarative
 
-module_qttranslations.subdir = $$IN_PWD/qttranslations
+module_qttranslations.subdir = qttranslations
 module_qttranslations.target = module-qttranslations
 module_qttranslations.depends = module_qttools
 
-module_qtdoc.subdir = $$IN_PWD/qtdoc
+module_qtdoc.subdir = qtdoc
 module_qtdoc.target = module-qtdoc
 module_qtdoc.depends = module_qtbase module_qtdeclarative
 
-module_qtactiveqt.subdir = $$IN_PWD/qtactiveqt
+module_qtactiveqt.subdir = qtactiveqt
 module_qtactiveqt.target = module-qtactiveqt
 module_qtactiveqt.depends = module_qtbase
 
-module_qlalr.subdir = $$IN_PWD/qlalr
+module_qlalr.subdir = qlalr
 module_qlalr.target = module-qlalr
 module_qlalr.depends = module_qtbase
 
-module_qtqa.subdir = $$IN_PWD/qtqa
+module_qtqa.subdir = qtqa
 module_qtqa.target = module-qtqa
 module_qtqa.depends = module_qtbase
 
-module_qtlocation.subdir = $$IN_PWD/qtlocation
+module_qtlocation.subdir = qtlocation
 module_qtlocation.target = module-qtlocation
-module_qtlocation.depends = module_qtbase module_qtdeclarative module_qt3d module_qtjsondb
+module_qtlocation.depends = module_qtbase module_qtdeclarative module_qt3d
 
-module_qtsensors.subdir = $$IN_PWD/qtsensors
+module_qtsensors.subdir = qtsensors
 module_qtsensors.target = module-qtsensors
 module_qtsensors.depends = module_qtbase module_qtdeclarative
 
-module_qtsystems.subdir = $$IN_PWD/qtsystems
+module_qtsystems.subdir = qtsystems
 module_qtsystems.target = module-qtsystems
 module_qtsystems.depends = module_qtbase module_qtdeclarative
 
-module_qtmultimedia.subdir = $$IN_PWD/qtmultimedia
+module_qtmultimedia.subdir = qtmultimedia
 module_qtmultimedia.target = module-qtmultimedia
 module_qtmultimedia.depends = module_qtbase module_qtdeclarative
 
-module_qtfeedback.subdir = $$IN_PWD/qtfeedback
+module_qtfeedback.subdir = qtfeedback
 module_qtfeedback.target = module-qtfeedback
-module_qtfeedback.depends = module_qtbase module_qtmultimedia module_qtdeclarative
+module_qtfeedback.depends = module_qtbase module_qtdeclarative
 
-module_qt3d.subdir = $$IN_PWD/qt3d
+module_qt3d.subdir = qt3d
 module_qt3d.target = module-qt3d
 module_qt3d.depends = module_qtbase module_qtdeclarative
 
-module_qtdocgallery.subdir = $$IN_PWD/qtdocgallery
-module_qtdocgallery.target = module-qtdocgallery
-module_qtdocgallery.depends = module_qtbase module_qtscript module_qtdeclarative
-
-module_qtpim.subdir = $$IN_PWD/qtpim
+module_qtpim.subdir = qtpim
 module_qtpim.target = module-qtpim
 module_qtpim.depends = module_qtdeclarative
 
-module_qtconnectivity.subdir = $$IN_PWD/qtconnectivity
+module_qtconnectivity.subdir = qtconnectivity
 module_qtconnectivity.target = module-qtconnectivity
 module_qtconnectivity.depends = module_qtsystems
 
-module_qtwayland.subdir = $$IN_PWD/qtwayland
+module_qtwayland.subdir = qtwayland
 module_qtwayland.target = module-qtwayland
 module_qtwayland.depends = module_qtbase module_qtdeclarative
 # not yet enabled by default
 module_qtwayland.CONFIG = no_default_target no_default_install
 
-module_qtjsondb.subdir = $$IN_PWD/qtjsondb
-module_qtjsondb.target = module-qtjsondb
-module_qtjsondb.depends = module_qtbase module_qtdeclarative module_qtxmlpatterns
-
-module_qtimageformats.subdir = $$IN_PWD/qtimageformats
+module_qtimageformats.subdir = qtimageformats
 module_qtimageformats.target = module-qtimageformats
 module_qtimageformats.depends = module_qtbase
 
-module_qtquick1.subdir = $$IN_PWD/qtquick1
+module_qtquick1.subdir = qtquick1
 module_qtquick1.target = module-qtquick1
-module_qtquick1.depends = module_qtbase module_qtscript module_qtxmlpatterns
+module_qtquick1.depends = module_qtbase module_qtscript
 
-module_qtgraphicaleffects.subdir = $$IN_PWD/qtgraphicaleffects
+module_qtgraphicaleffects.subdir = qtgraphicaleffects
 module_qtgraphicaleffects.target = module-qtgraphicaleffects
-module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative module_qtsvg module_qtxmlpatterns
-# not yet enabled by default
-module_qtgraphicaleffects.CONFIG = no_default_target no_default_install
+module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative
 
 # only qtbase is required to exist. The others may not - but it is the
 # users responsibility to ensure that all needed dependencies exist, or
@@ -136,43 +125,60 @@ exists(qtsvg/qtsvg.pro) {
     module_qtdeclarative.depends += module_qtsvg
     module_qtquick1.depends += module_qtsvg
 }
-exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon
-exists(qtxmlpatterns/qtxmlpatterns.pro): SUBDIRS += module_qtxmlpatterns
-exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript
+exists(qtxmlpatterns/qtxmlpatterns.pro) {
+    SUBDIRS += module_qtxmlpatterns
+    # These modules do not require qtxmlpatterns, but can use it if it is available
+    module_qtdeclarative.depends += module_qtxmlpatterns
+    module_qtquick1.depends += module_qtxmlpatterns
+}
+
+exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
 exists(qtdeclarative/qtdeclarative.pro): SUBDIRS += module_qtdeclarative
-exists(qttools/qttools.pro): SUBDIRS += module_qttools
-exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
-exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
-exists(qlalr/qlalr.pro): SUBDIRS += module_qlalr
-exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
-exists(qtlocation/qtlocation.pro): SUBDIRS += module_qtlocation
+exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d
+exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript
+exists(qtlocation/qtlocation.pro) {
+    SUBDIRS += module_qtlocation
+    # These modules do not require qtlocation, but can use it if it is available
+    module_qtwebkit.depends += module_qtlocation
+}
+exists(qtsensors/qtsensors.pro) {
+    SUBDIRS += module_qtsensors
+    # These modules do not require qtsensors, but can use it if it is available
+    module_qtwebkit.depends += module_qtsensors
+}
+exists(qtsystems/qtsystems.pro) {
+    SUBDIRS += module_qtsystems
+    # These modules do not require qtsystems, but can use it if it is available
+    module_qtlocation.depends += module_qtsystems
+}
+exists(qtmultimedia/qtmultimedia.pro) {
+    SUBDIRS += module_qtmultimedia
+    # These modules do not require qtmultimedia, but can use it if it is available
+    module_qtfeedback.depends += module_qtmultimedia
+    module_qtlocation.depends += module_qtmultimedia
+}
+exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
+exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
+exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity
 exists(qtactiveqt/qtactiveqt.pro) {
     SUBDIRS += module_qtactiveqt
     module_qttools.depends += module_qtactiveqt
 }
-exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
-exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
-exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
-exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
-exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d
-exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
-exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
-exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity
-!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
-exists(qtjsondb/qtjsondb.pro) {
-    SUBDIRS += module_qtjsondb
-    # These modules do not require qtjsondb, but can use it if it is available
-    module_qtpim.depends += module_qtjsondb
-    module_qtdocgallery.depends += module_qtjsondb
-    module_qtsystems.depends += module_qtjsondb
-}
-exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
-exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
-exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
-exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects
-
-exists(qtwebkit/Tools/Scripts/build-webkit) {
-    SUBDIRS +=  module_qtwebkit \
-                module_qtwebkit_examples_and_demos
+exists(qtwebkit/WebKit.pro) {
+    SUBDIRS +=  module_qtwebkit
     module_qttools.depends += module_qtwebkit
 }
+exists(qttools/qttools.pro) {
+    SUBDIRS += module_qttools
+    module_qtquick1.depends += module_qttools
+}
+exists(qtwebkit/WebKit.pro):exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro): \
+    SUBDIRS += module_qtwebkit_examples_and_demos
+exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
+!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
+exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
+exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects
+exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
+exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
+exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
+exists(qlalr/qlalr.pro): SUBDIRS += module_qlalr

qtwebkit.pri

@@ -41,12 +41,9 @@ else:qtwebkit_tools_dir = Tools
 QTWEBKIT_BUILD_CONFIG =
 contains(CONFIG, release):!contains(CONFIG, debug_and_release): {QTWEBKIT_BUILD_CONFIG = --release}
 
-# npapi does not work for qpa, as of qtwebkit 81b8dac16049715b94dc36256bd9f433f7dfacc5 .
-# This should be reverted once npapi either works, or gracefully disables itself, for qpa.
-qpa:QTWEBKIT_BUILD_CONFIG += --no-netscape-plugin
-
 # WebKit2 is not yet supported on Windows, so avoid trying to build it
-win32:QTWEBKIT_BUILD_CONFIG += --no-webkit2
+# Disable WebKit2 until https://bugs.webkit.org/show_bug.cgi?id=94914 is fixed.
+QTWEBKIT_BUILD_CONFIG += --no-webkit2
 
 # The '+' is to make parallel "make" work across the script boundary.
 module_qtwebkit.commands = $${OPTI}$${SBC}cd qtwebkit && \
@@ -55,6 +52,7 @@ module_qtwebkit.commands = $${OPTI}$${SBC}cd qtwebkit && \
                                --qt \
                                --qmake=$(QMAKE) \
                                --install-libs=$$[QT_INSTALL_LIBS] \
+                               --qmakearg=CONFIG+=production_build \
                                $$QTWEBKIT_BUILD_CONFIG
 #                               "--makeargs=\"-$(MAKEFLAGS)\""
 # Trick to force dependency on this rule.
@@ -75,13 +73,7 @@ module_qtwebkit_clean.commands = $${OPTI}$${SBC}cd qtwebkit && \
 module_qtwebkit_clean.commands += $$escape_expand(\\n)clean: module-qtwebkit-clean
 module_qtwebkit_clean.target = module-qtwebkit-clean
 
-module_qtwebkit_install.commands = $${OPTI}$${SBC}cd qtwebkit && \
-                           $$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \
-                           perl $$PWD$${DS}qtwebkit$${DS}$${qtwebkit_tools_dir}$${DS}Scripts$${DS}build-webkit \
-                               --qt \
-                               --qmake=$(QMAKE) \
-                               --install-libs=$$[QT_INSTALL_LIBS] \
-                               "--makeargs=\"install\""
+module_qtwebkit_install.commands = $${OPTI}$${SBC}cd qtwebkit/WebKitBuild/Release && $(MAKE) install
 # Trick to force dependency on this rule.
 module_qtwebkit_install.commands+= $$escape_expand(\\n)install: module-qtwebkit-install
 module_qtwebkit_install.target = module-qtwebkit-install