lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-02 22:45:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

Browse Source 
* '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
This commit is contained in:
Qt Continuous Integration System
2011-05-20 02:30:47 +10:00
parent 04dd09b17f 25d7376943
commit 3660ebd9ef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
init-repository
View File

@@ -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 }},

2
qt.pro
View File

@@ -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