From e0128ca3763cd3743c39a36b7029065f56e393fc Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Tue, 27 Mar 2012 09:50:27 -0500 Subject: Clean up build script Remove loading of thread modules. Not core module, and we don't use them. Return value of system command. Add --force-qmake option, and by default avoid running qmake when a Makefile already exists. Do not pass '-j 1' unless explicit on the command line, and pick up 'MAKE' environment variable. (Thiago) Remove usage of File::Which, as it's not a core module, and often not present on host machines. (Peppe) Remove '-s' or '/s' optin to make/nmake, as we cannot see how far we have compiled, and we only get warnings/errors. Change the qtwebkit build command, and add separate command for installing qtwebkit. Also add the required build tools for WebKit on Windows. Change-Id: I79bffa39a13ece78fa401f39a38a1ccaf0f389b0 --- build | 80 ++++++++++++++++++++++++++++++++++++------------------ build.dependencies | 18 +++++++++--- 2 files changed, 67 insertions(+), 31 deletions(-) diff --git a/build b/build index 6414260b..17be3e9a 100755 --- a/build +++ b/build @@ -51,9 +51,8 @@ use English qw( -no_match_vars ); use Getopt::Long qw( GetOptionsFromArray ); use Pod::Usage qw( pod2usage ); use Cwd qw( getcwd ); +use File::Spec qw( path catfile ); use Config; -use thread; -use threads::shared; # Like `system', but possibly log the command, and die on non-zero exit code sub exe @@ -66,7 +65,7 @@ sub exe confess "@cmd exited with status $CHILD_ERROR"; } - return; + return 0; } sub dropPrivileges() @@ -112,8 +111,8 @@ sub exeLowPriv() die "Couldn't fork" unless defined $pid; if ($pid == 0) { $self->dropPrivileges; - $ret = $self->exe(@cmd); - exit $ret; + $self->exe(@cmd); + exit 0; } else { waitpid($pid, 0); return $?; @@ -133,7 +132,7 @@ sub new my $depfile = "build.dependencies"; my $result; - our (%build_dependencies, %build_commands); + our (%build_dependencies, %build_commands, %install_commands); # following variables may be expanded in the evaluation below my $MAKEOPTS = $self->{'MAKEOPTS'}; @@ -145,7 +144,8 @@ sub new } $self->{'deps'} = \%build_dependencies; - $self->{'cmds'} = \%build_commands; + $self->{'buildcmds'} = \%build_commands; + $self->{'instcmds'} = \%install_commands; return $self; } @@ -157,7 +157,8 @@ sub parse_arguments %{$self} = (%{$self}, 'verbose' => 0, 'continue' => 0, - 'jobs' => 1, + 'jobs' => -1, + 'force_qmake' => 0, 'build-submodules' => [], ); @@ -165,6 +166,7 @@ sub parse_arguments 'verbose|v:1' => \$self->{'verbose'}, 'continue' => \$self->{'continue'}, 'jobs|j:1' => \$self->{'jobs'}, + 'force-qmake' => \$self->{'force_qmake'}, 'help|?' => sub { pod2usage(1); }, ) || pod2usage(2); @@ -173,20 +175,39 @@ sub parse_arguments return; } +sub which { + my ($self, $exe) = @_; + + foreach my $path (File::Spec->path()) { + my $file = File::Spec->catfile($path, $exe); + return $file if -x $file; + } + return; +} + sub detect_configuration { my ($self) = @_; die "You need to configure Qt before you try to build it, aborting." if (!-e 'qtbase/.qmake.cache'); - $self->{'MAKEOPTS'} = "-s -j $self->{'jobs'}"; - $self->{'MAKE'} = "make"; + use Cwd qw(abs_path); + use Env qw(@PATH); - if ("$Config{osname}" =~ /(ms|cyg)win/i) { - use File::Which; - my $exe = which("nmake.exe"); - $exe = which("jom.exe") if (defined $exe && which("jom.exe")); - $exe = which("mingw32-make") if (!defined $exe); + my $abs_path = abs_path('qtbase/bin'); + unshift @PATH, $abs_path; + + if ($self->{'jobs'} >= 0) { + $self->{'MAKEOPTS'} = "-j $self->{'jobs'}"; + } else { + $self->{'MAKEOPTS'} = ""; + } + $self->{'MAKE'} = $ENV{MAKE} || "make"; + + if ("$Config{osname}" =~ /mswin/i) { + my $exe = $self->which("nmake.exe"); + $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') { @@ -194,14 +215,11 @@ sub detect_configuration unshift @CL, '/MP'; } - $self->{'MAKE'} = $exe if (defined $exe); - $self->{'MAKEOPTS'} = "/s" if (defined $exe && $exe =~ /nmake/); - } + $self->{'MAKE'} = "\"$exe\"" if (defined $exe); + $self->{'MAKEOPTS'} = "" if (defined $exe && $exe =~ /nmake/); - if (-e 'qtbase/bin') { - use Cwd qw(abs_path); - use Env qw(@PATH); - my $abs_path = abs_path('qtbase/bin'); + # Tools needed for building QtWebKit/Windows (Bison, Flex, gperf, iconv) + my $abs_path = abs_path('gnuwin32/bin'); unshift @PATH, "$abs_path"; } } @@ -342,10 +360,17 @@ sub get_all_next_modules sub build_project { my ($self, $module) = @_; - my $build_command = $self->{'cmds'}->{$module}; - $build_command = "qmake -r && $self->{MAKE} $self->{MAKEOPTS}" if (!defined $build_command); - exeLowPriv("cd $module && $build_command") && die "'cd $module && $build_command' failed: $?"; - exeHighPriv("cd $module && $self->{MAKE} install") && die "'cd $module && $self->{MAKE} install failed: $?"; + my $build_command = $self->{'buildcmds'}->{$module}; + 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: $?"; + } + $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); + $self->exeHighPriv("cd $module && $install_command") && die "'cd $module && $install_command failed: $?"; $self->mark_as_finished($module); return 0; } @@ -357,7 +382,8 @@ sub build_qt printf "OS Name ........ %s\n", $Config{osname}; printf "Verbose ........ %s\n", ($self->{'verbose'} ? $self->{'verbose'} : "no"); printf "Continue ....... %s\n", ($self->{'continue'} ? "yes" : "no"); - printf "Jobs ........... %d\n", $self->{'jobs'}; + printf "Force qmake..... %s\n", ($self->{'force_qmake'} ? "yes" : "no"); + printf "Jobs ........... %s\n", ($self->{'jobs'} >= 0 ? $self->{'jobs'} : "unset"); my $path = $ENV{'PATH'}; print "PATH $path\n"; diff --git a/build.dependencies b/build.dependencies index f92f5442..29a4fe6d 100644 --- a/build.dependencies +++ b/build.dependencies @@ -19,7 +19,7 @@ use Config; "qtimageformats" => "qtbase", "qtjsbackend" => "qtbase", "qtjsondb" => "qtbase,qtdeclarative,qtxmlpatterns", - "qtlocation" => "qtbase,qtdeclarative,qt3d,qtjsondb", + "qtlocation" => "qtbase,qtdeclarative,qt3d,qtjsondb:s", "qtmultimedia" => "qtbase,qtdeclarative", "qtphonon" => "qtbase", "qtpim" => "qtdeclarative,qtjsondb:s", @@ -36,14 +36,24 @@ use Config; "qtxmlpatterns" => "qtbase", ); -%build_commands = ( - "qtwebkit" => "QMAKEPATH=Tools/qmake qmake && make", +if ("$Config{osname}" =~ /mswin/i) { + %build_commands = ( + "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --no-netscape-plugin --no-webkit2", + ); +} else { + %build_commands = ( + "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --release --no-netscape-plugin", + ); +} + +%install_commands = ( + "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --makeargs=\"install\"", ); # Platform specific modules if ("$Config{osname}" =~ /linux/i) { - $build_dependencies{"qtwaysland"} = "qtbase"; + $build_dependencies{"qtwayland"} = "qtbase"; } if ("$Config{osname}" =~ /(ms|cyg)win/i) { -- cgit v1.2.3 From c5e269cc9f3611dc59d793ea0dfd8dd2d1255abe Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 28 Mar 2012 05:48:40 -0500 Subject: Fix readme to instruct building with the build script instead Also, on Windows the build script adds the gnuwin32\bin directory, so we don't need that part in the readme Change-Id: I36ac9ebef9ce8b74fa75f63be7243bb334512a32 --- README | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README b/README index 9cac8bd3..5ad781ee 100644 --- a/README +++ b/README @@ -31,7 +31,7 @@ HOW TO BUILD QT5 cd /qt-everywhere-opensource-src- export PATH=$PATH:$PWD/qtbase/bin ./configure -prefix $PWD/qtbase -opensource -nomake tests - make -j4 + ./build -j4 Windows: -------- @@ -41,13 +41,18 @@ HOW TO BUILD QT5 path. cd \qt-everywhere-opensource-src- - set PATH=%PATH%;%CD%\qtbase\bin;%CD%\gnuwin32\bin + set PATH=%PATH%;%CD%\qtbase\bin; configure -prefix %CD%\qtbase -opensource -nomake tests - nmake + perl build For MinGW (gcc version 4.6 or later), ensure that the compiler can be found in the path. + The build script will use jom if it's found in the path, which means you can + use -j options on Windows as well. If not, the /MP option is added to the + compile options of the Microsoft Visual Studio compiler, to use all available + cores for batch building. + More details follow. Building QtWebKit -- cgit v1.2.3 From 24517c73911643bbbf5c5423d0db5c9065edd788 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 28 Mar 2012 16:28:25 -0500 Subject: Add build dependency for qtwayland + make qtwayland non default module Running ./build qtwayland will build qtwayland and its dependencies. Change-Id: I78f0b0cec6bc21a14f0d8d89e42080589d9b28b6 --- build | 10 ++++++++-- build.dependencies | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build b/build index 17be3e9a..7fc3ed48 100755 --- a/build +++ b/build @@ -132,7 +132,7 @@ sub new my $depfile = "build.dependencies"; my $result; - our (%build_dependencies, %build_commands, %install_commands); + our (%build_dependencies, %build_commands, %install_commands, @nondefault_modules); # following variables may be expanded in the evaluation below my $MAKEOPTS = $self->{'MAKEOPTS'}; @@ -146,6 +146,7 @@ sub new $self->{'deps'} = \%build_dependencies; $self->{'buildcmds'} = \%build_commands; $self->{'instcmds'} = \%install_commands; + $self->{'nondefault'} = \@nondefault_modules; return $self; } @@ -415,7 +416,12 @@ sub run if (scalar @{$self->{'build-submodules'}} > 0) { $self->check_build_modules(1); } else { - push(@{$self->{'build-submodules'}}, keys(%{$self->{'deps'}})); + my @default = keys(%{$self->{'deps'}}); + my @nondefault = @{$self->{'nondefault'}}; + foreach my $item (@nondefault) { + @default = grep { $_ ne $item } @default; + } + push(@{$self->{'build-submodules'}}, @default); $self->check_build_modules(0); } diff --git a/build.dependencies b/build.dependencies index 29a4fe6d..a8e96f33 100644 --- a/build.dependencies +++ b/build.dependencies @@ -36,6 +36,10 @@ use Config; "qtxmlpatterns" => "qtbase", ); +@nondefault_modules = ( + "qtwayland", +); + if ("$Config{osname}" =~ /mswin/i) { %build_commands = ( "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --no-netscape-plugin --no-webkit2", @@ -53,7 +57,7 @@ if ("$Config{osname}" =~ /mswin/i) { # Platform specific modules if ("$Config{osname}" =~ /linux/i) { - $build_dependencies{"qtwayland"} = "qtbase"; + $build_dependencies{"qtwayland"} = "qtbase,qtdeclarative"; } if ("$Config{osname}" =~ /(ms|cyg)win/i) { -- cgit v1.2.3 From 14b6752894a4760929852d8969d70324d5d19812 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 29 Mar 2012 05:59:44 -0500 Subject: Avoid building webkit by default on Windows for now WebKit still doesn't compile cleanly on Windows, so avoid it until we have something which works. Change-Id: I468dfbd01741705cd0bba3b035855d46acbb42e9 --- build.dependencies | 1 + 1 file changed, 1 insertion(+) diff --git a/build.dependencies b/build.dependencies index a8e96f33..ab4ad911 100644 --- a/build.dependencies +++ b/build.dependencies @@ -44,6 +44,7 @@ if ("$Config{osname}" =~ /mswin/i) { %build_commands = ( "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --no-netscape-plugin --no-webkit2", ); + push @nondefault_modules, ("qtwebkit", "qtwebkit-examples-and-demos"); } else { %build_commands = ( "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --release --no-netscape-plugin", -- cgit v1.2.3 From 0cfef634ed4ffdd90b810266d291346bcec51c7c Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 28 Mar 2012 13:07:22 -0500 Subject: Avoid 'make install' on Windows We normally don't 'make install' on Windows, so avoid it for the alpha. Change-Id: Ia5563791be249ea04abdda64b94e15afb2608add --- build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build b/build index 7fc3ed48..a88114dd 100755 --- a/build +++ b/build @@ -371,7 +371,10 @@ sub build_project } $self->exeLowPriv("cd $module && $build_command") && die "'cd $module && $build_command' failed: $?"; $install_command = "$self->{MAKE} install" if (!defined $install_command); - $self->exeHighPriv("cd $module && $install_command") && die "'cd $module && $install_command failed: $?"; + ### TODO: Should be fixed after the alpha + unless ("$Config{osname}" =~ /mswin/i) { + $self->exeHighPriv("cd $module && $install_command") && die "'cd $module && $install_command failed: $?"; + } $self->mark_as_finished($module); return 0; } -- cgit v1.2.3 From 239b974f079535442a0bdfff083f1b806d722c2c Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 29 Mar 2012 09:07:20 -0500 Subject: Fix building on Windows and OSX A problem with the dependency algorithm would make the top-most dependent module not compile. Also affects building QtWayland on Linux. OSX has a problem when doing 'make install' on Qt configured with prefix pointing to qtbase (no installation needed), so disable that for the alpha, like on Windows. Also, remove a redundant line in the script. Change-Id: I368e80520977cf8a4bfcbbf13445f50c820aee9c --- build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build b/build index a88114dd..ded93996 100755 --- a/build +++ b/build @@ -291,12 +291,17 @@ sub resolve_soft_dependencies { my ($self) = @_; + my @nondefault = @{$self->{'nondefault'}}; foreach my $module (keys(%{$self->{'deps'}})) { my @deps = split(/,/, $self->{'deps'}->{$module}); my @newdeps; foreach my $dep (@deps) { if ($dep =~ /(.*):s$/) { - push(@newdeps, $1) if (defined $self->{'deps'}->{$1}) + my $mod = $1; + if (defined $self->{'deps'}->{$mod} + && !grep {$_ eq $mod} @nondefault) { + push(@newdeps, $mod); + } } else { push(@newdeps, $dep); } @@ -331,7 +336,7 @@ sub get_next_modules } foreach my $dep (split(/,/, $deps)) { - push (@nextModules, $self->get_next_modules($dep)) unless $self->{'seenHash'}->{$module}; + push (@nextModules, $self->get_next_modules($dep)) unless $self->{'seenHash'}->{$dep}; } return @nextModules; @@ -372,7 +377,7 @@ sub build_project $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}" =~ /mswin/i) { + unless ("$Config{osname}" =~ /(dar|ms)win/i) { $self->exeHighPriv("cd $module && $install_command") && die "'cd $module && $install_command failed: $?"; } $self->mark_as_finished($module); @@ -398,7 +403,6 @@ sub build_qt print " $mods\n"; while (my @modules = $self->get_all_next_modules) { - my @modules = $self->get_all_next_modules; foreach my $module (@modules) { print "build $module...\n"; $self->build_project($module); -- cgit v1.2.3 From 8e5b652334c76c9275d39b460fffad19a2150721 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 29 Mar 2012 16:17:33 +0200 Subject: Fix build instructions (-j ). Change-Id: Ib9b23fed10b687e67859058fb35f92b2250be98f --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 5ad781ee..19032e3d 100644 --- a/README +++ b/README @@ -31,7 +31,7 @@ HOW TO BUILD QT5 cd /qt-everywhere-opensource-src- export PATH=$PATH:$PWD/qtbase/bin ./configure -prefix $PWD/qtbase -opensource -nomake tests - ./build -j4 + ./build -j 4 Windows: -------- -- cgit v1.2.3 From 3b111290982e6816624328cc66e3658db911f3df Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Tue, 10 Apr 2012 20:32:34 -0500 Subject: Qt 5.0.0 Alpha1 --- .gitmodules | 33 --------------------------------- qlalr | 1 - qt3d | 2 +- qtactiveqt | 1 - qtbase | 2 +- qtconnectivity | 1 - qtdocgallery | 1 - qtfeedback | 1 - qtjsondb | 1 - qtphonon | 1 - qtpim | 1 - qtqa | 1 - qtquick1 | 2 +- qtrepotools | 1 - qttools | 2 +- qttranslations | 1 - qtwayland | 2 +- qtwebkit | 2 +- 18 files changed, 6 insertions(+), 50 deletions(-) delete mode 160000 qlalr delete mode 160000 qtactiveqt delete mode 160000 qtconnectivity delete mode 160000 qtdocgallery delete mode 160000 qtfeedback delete mode 160000 qtjsondb delete mode 160000 qtphonon delete mode 160000 qtpim delete mode 160000 qtqa delete mode 160000 qtrepotools delete mode 160000 qttranslations diff --git a/.gitmodules b/.gitmodules index e7d5d1eb..e83ecc26 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,15 +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 -[submodule "qtphonon"] - path = qtphonon - url = git://gitorious.org/qt/qtphonon.git [submodule "qtmultimedia"] path = qtmultimedia url = git://gitorious.org/qt/qtmultimedia.git @@ -25,24 +19,12 @@ [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 @@ -55,24 +37,9 @@ [submodule "qtsystems"] path = qtsystems url = git://gitorious.org/qt/qtsystems.git -[submodule "qtfeedback"] - path = qtfeedback - url = git://gitorious.org/qt/qtfeedback.git -[submodule "qtdocgallery"] - path = qtdocgallery - url = git://gitorious.org/qt/qtdocgallery.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 -[submodule "qtjsondb"] - path = qtjsondb - url = git://gitorious.org/qt/qtjsondb.git [submodule "qt3d"] path = qt3d url = git://gitorious.org/qt/qt3d.git diff --git a/qlalr b/qlalr deleted file mode 160000 index c786df11..00000000 --- a/qlalr +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c786df115d7d0ab9968dbd6facced669cca2bf28 diff --git a/qt3d b/qt3d index b98b2f0b..4b2cffa4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b98b2f0b1f208f0a91e05f894dc87586111a6904 +Subproject commit 4b2cffa47a66add6e10f4408bb8a9cea33f781e9 diff --git a/qtactiveqt b/qtactiveqt deleted file mode 160000 index fea1dd62..00000000 --- a/qtactiveqt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fea1dd6238a4c5f7f49e0c2719df906eb2f30e6a diff --git a/qtbase b/qtbase index cbc883da..ca572c0b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cbc883da6910b3357a4e03d0e2dfa841da1a03e8 +Subproject commit ca572c0b806388cbc58dcba4ab6d7cc25d89366a diff --git a/qtconnectivity b/qtconnectivity deleted file mode 160000 index 1f80a5ac..00000000 --- a/qtconnectivity +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1f80a5ac15e145dc2743bc5e4261ed8474a41a82 diff --git a/qtdocgallery b/qtdocgallery deleted file mode 160000 index 692ef908..00000000 --- a/qtdocgallery +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 692ef9081a18a7640401bd041036fac8c2e0111b diff --git a/qtfeedback b/qtfeedback deleted file mode 160000 index fb277cbd..00000000 --- a/qtfeedback +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fb277cbdcff5cd30b9d3425797e406ef0b91c4ec diff --git a/qtjsondb b/qtjsondb deleted file mode 160000 index f4c59eae..00000000 --- a/qtjsondb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f4c59eaeb1c1e67117c470e77a8c75d6890bb5f0 diff --git a/qtphonon b/qtphonon deleted file mode 160000 index b362e749..00000000 --- a/qtphonon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b362e749bf7d87539ec5c8025b7af9394f1c3cde diff --git a/qtpim b/qtpim deleted file mode 160000 index bfcf62df..00000000 --- a/qtpim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bfcf62df2997b8b09c932569d4fd800b055d81ce diff --git a/qtqa b/qtqa deleted file mode 160000 index 7134adad..00000000 --- a/qtqa +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7134adad67f947fda66571fca5a21d3a2a53f00b diff --git a/qtquick1 b/qtquick1 index 3b483265..bc60289c 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 3b483265f14db467464dc9aac89dcd1d8f24b372 +Subproject commit bc60289c41ca5a069e7a0845f2ff1b3ab107d544 diff --git a/qtrepotools b/qtrepotools deleted file mode 160000 index a2ba3c9a..00000000 --- a/qtrepotools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a2ba3c9a6f669240376537fbb6bba58dd54148d8 diff --git a/qttools b/qttools index 3c7c8867..ef2557d7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3c7c8867c4b4807361cb23125550154ae6e8cab7 +Subproject commit ef2557d7df7d8134344db5473042c5805fb37314 diff --git a/qttranslations b/qttranslations deleted file mode 160000 index d23250c4..00000000 --- a/qttranslations +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d23250c442368365f3d8c906bb837664197936f5 diff --git a/qtwayland b/qtwayland index 6ace8196..72db1a20 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6ace81964c8786700aaa82568e7f3a4c35b63172 +Subproject commit 72db1a20a522d1ecdffbacd704de0d76fbd4faf6 diff --git a/qtwebkit b/qtwebkit index 5b76cf93..32f186b0 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 5b76cf937e8472b29467d337ea96aeef9cf6096e +Subproject commit 32f186b0a5b8f5d13d83d2f7d52dce031928904d -- cgit v1.2.3