From 66bd89af42acbfc0ffb78c944df3c1fcd946944d Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 19 May 2011 11:22:25 -0500 Subject: [PATCH 1/2] Fix --ignore-submodules in init-repository after refactoring --- init-repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 4f9d4af9..93465045 100755 --- a/init-repository +++ b/init-repository @@ -265,7 +265,7 @@ sub parse_arguments 'alternates=s' => \$self->{qw{ alternates }}, 'copy-objects' => \$self->{qw{ detach-alternates }}, 'force' => \$self->{qw{ force }}, - 'ignore-submodules' => \$self->{qw{ ignore_submodules }}, + 'ignore-submodules' => \$self->{qw{ ignore-submodules }}, 'mirror-webkit=s' => \$self->{qw{ mirror-webkit-url }}, 'mirror=s' => \$self->{qw{ mirror-url }}, 'nokia-developer' => \$self->{qw{ nokia-developer }}, From 25d7376943f792878307af0a560a5e7fe3b7a8e6 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 19 May 2011 11:23:27 -0500 Subject: [PATCH 2/2] Correct missing module_activeqt -> module_qtactiveqt --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index 5aa4c7dd..12709517 100644 --- a/qt.pro +++ b/qt.pro @@ -43,7 +43,7 @@ module_qtwebkit_examples_and_demos.depends = module_qtwebkit module_qttools.subdir = $$IN_PWD/qttools module_qttools.target = module-qttools module_qttools.depends = module_qtbase module_qtscript module_qtdeclarative -win32:module_qttools.depends += module_activeqt +win32:module_qttools.depends += module_qtactiveqt module_qttranslations.subdir = $$IN_PWD/qttranslations module_qttranslations.target = module-qttranslations