From 2805296c1faf94e185a8e401b19285200bbd5d1f Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Wed, 6 Jul 2011 18:36:10 +1000 Subject: [PATCH] Update sync.profile dependencies to new syntax %dependencies now has a simpler format of gitmodule => gitref instead of using qt modules and keywords. Change-Id: I785f30e24e0a793218e2e307bdde56067760c513 Reviewed-on: http://codereview.qt.nokia.com/1215 Reviewed-by: Qt Sanity Bot Reviewed-by: Rohan McGovern --- sync.profile | 41 ++++------------------------------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/sync.profile b/sync.profile index d180458445..c8e113b345 100644 --- a/sync.profile +++ b/sync.profile @@ -67,44 +67,11 @@ @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" ); @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" ); -# Modules and programs, and their dependencies. +# Module dependencies. +# Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: # - A specific Git revision. -# - "LATEST_REVISION", to always test against the latest revision. -# - "LATEST_RELEASE", to always test against the latest public release. -# - "THIS_REPOSITORY", to indicate that the module is in this repository. +# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) +# %dependencies = ( - "QtOpenVG" => { - "QtCore" => "THIS_REPOSITORY", - "QtGui" => "THIS_REPOSITORY", - }, - "QtCore" => { - }, - "QtOpenGL" => { - "QtCore" => "THIS_REPOSITORY", - "QtGui" => "THIS_REPOSITORY", - }, - "QtXml" => { - "QtCore" => "THIS_REPOSITORY", - }, - "QtNetwork" => { - "QtCore" => "THIS_REPOSITORY", - }, - "QtTest" => { - "QtCore" => "THIS_REPOSITORY", - }, - "QtDBus" => { - "QtCore" => "THIS_REPOSITORY", - "QtXml" => "THIS_REPOSITORY", - }, - "QtSql" => { - "QtCore" => "THIS_REPOSITORY", - }, - "QtGui" => { - "QtCore" => "THIS_REPOSITORY", - }, - "QtUiTools" => { - "QtCore" => "THIS_REPOSITORY", - "QtGui" => "THIS_REPOSITORY", - }, );