diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-12 22:34:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-14 08:01:35 +0100 |
| commit | 0c213fbb11c3ec307339a3d183552e0a84108ce6 (patch) | |
| tree | 69d58ddaf71279f10abc3606329e9c255cddca7f /scripts/qt | |
| parent | 3e37cc74538ab877ca604c1f2d73cd9e9ebef06d (diff) | |
qtmod_test: Use stable branch instead of master by default
There are three use cases that may require the stable branch:
- to use it when there is no sync.profile or explicit dependencies
qtbase.git does not have a master branch nowadays, so pointing to
stable is a must (eg. for qtqa.git)
- to handle the revdep configurations branches
qtbase.git does not have a master branch nowadays, but this should
be already fixed in testconfig.git
- to clone the qt5.git supermodule
qt5.git still has a master branch, but it could be removed at any time.
Change-Id: Idd26cd3d924bc0002c395dc75b0f38cbdb8e219c
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index 56e25254..2ae22380 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -89,7 +89,7 @@ my @PROPERTIES = ( q{location} => q{location hint for git mirrors (`oslo' or `brisbane'); } . q{only useful inside of Nokia LAN}, - q{qt.branch} => q{git branch of Qt superproject (e.g. `master'); only used } + q{qt.branch} => q{git branch of Qt superproject (e.g. `stable'); only used } . q{if qt.gitmodule != "qt5"}, q{qt.configure.args} => q{space-separated arguments passed to Qt's configure}, @@ -134,11 +134,11 @@ my @PROPERTIES = ( . q{qtdeclarative on top of qtbase)}, q{qt.revdep.revdep_ref} => q{git ref for the name of the reverse dependency module under test } - . q{(e.g. `refs/heads/master'); mandatory iff qt.revdep.gitmodule is } + . q{(e.g. `refs/heads/stable'); mandatory iff qt.revdep.gitmodule is } . q{set}, q{qt.revdep.dep_ref} => q{git ref for the name of the dependency module upon which the } - . q{revdep shall be tested (e.g. `refs/heads/master'); mandatory iff } + . q{revdep shall be tested (e.g. `refs/heads/stable'); mandatory iff } . q{qt.revdep.gitmodule is set}, q{qt.repository} => q{giturl of Qt superproject; only used if } @@ -476,7 +476,7 @@ sub read_and_store_configuration 'qt.revdep.dep_ref' => \&default_qt_revdep_ref , 'qt.dir' => \&default_qt_dir , 'qt.repository' => \&default_qt_repository , - 'qt.branch' => q{master} , + 'qt.branch' => q{stable} , 'qt.init-repository.args' => q{} , 'qt.configure.args' => \&default_qt_configure_args , 'qt.configure.extra_args' => q{} , @@ -566,7 +566,7 @@ sub read_dependencies our (%dependencies); - my %default_dependencies = ( 'qtbase' => 'refs/heads/master' ); + my %default_dependencies = ( 'qtbase' => 'refs/heads/stable' ); my $default_reason; if (! -e $dependency_file ) { |