diff options
| author | Simo Fält <simo.falt@digia.com> | 2012-11-19 15:17:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-27 15:01:01 +0100 |
| commit | 8d5c3a2d5a5d22779504b6c3a6c1c2cdf7263542 (patch) | |
| tree | f7c9667b2a5dc5a4398be5c12f61792d6be73efa /scripts/qt | |
| parent | ffc4881844ed93e5f4b5ba93bc8c10c5cd61f7e5 (diff) | |
Adding configurable property for sync.profile
QtWebkit is having its sync.profile in non-default directory. Added
property for giving additional sub-dir name.
Change-Id: I77ded6018ad9ea9af9094c5a98f03e3d74003756
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index 4cbd591e..56e25254 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -208,6 +208,11 @@ my @PROPERTIES = ( . q{tests (e.g. `-j2'); defaults to the value of make.args with } . q{any -jN replaced with -j1, and with -k appended}, + q{qt.sync.profile.dir} => q{dir prefix, if sync.profile is not stored directly under } + . q{$qt.gitmodule/sync.profile. This will append it to } + . q{$qt.gitmodule/$qt.sync.profile.dir/sync.profile }, + + ); # gitmodules for which `make check' is not yet safe. @@ -493,6 +498,8 @@ sub read_and_store_configuration 'qt.qtqa-tests.enabled' => 0 , 'qt.qtqa-tests.insignificant' => 0 , + 'qt.sync.profile.dir' => q{} , + ); # for convenience only - this should not be overridden @@ -791,6 +798,8 @@ sub run_git_checkout my $qt_revdep_gitmodule = $self->{ 'qt.revdep.gitmodule' }; my $qt_revdep_revdep_ref = $self->{ 'qt.revdep.revdep_ref' }; my $location = $self->{ 'location' }; + my $qt_sync_profile_dir = $self->{ 'qt.sync.profile.dir' }; + # We don't need to clone submodules for qt/qt.git return if ($qt_gitmodule eq 'qt'); @@ -824,7 +833,7 @@ sub run_git_checkout # an incoming change delete $module_to_ref{ $qt_gitmodule }; } elsif ($qt_gitmodule ne 'qt5' && $qt_gitmodule ne 'qtbase') { - %module_to_ref = $self->read_dependencies( catfile($base_dir, 'sync.profile') ); + %module_to_ref = $self->read_dependencies( catfile($base_dir, $qt_sync_profile_dir, 'sync.profile') ); } # clone any remaining modules we haven't got yet. |