diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 02:30:47 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 02:30:47 +1000 |
| commit | 3660ebd9ef081ef2d08fe5b69d2a62b2eb4150a6 (patch) | |
| tree | 2d6a4315a57ae9425e4f9056029fda35774704d4 | |
| parent | 04dd09b17fadf5e1917a286870469c0733044cf6 (diff) | |
| parent | 25d7376943f792878307af0a560a5e7fe3b7a8e6 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
Correct missing module_activeqt -> module_qtactiveqt
Fix --ignore-submodules in init-repository after refactoring
| -rwxr-xr-x | init-repository | 2 | ||||
| -rw-r--r-- | qt.pro | 2 |
2 files changed, 2 insertions, 2 deletions
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 }}, @@ -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 |