diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:52:22 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:52:22 +0200 |
commit | 2371147354d4436bb54c588662ac315dd4c2f940 (patch) | |
tree | 5c90b1dd18de394cff2fb4e1bedc628da3c7d341 /sync.profile | |
parent | 54ec6d177e0e8fb04cd01e70461484a80ca1f7a4 (diff) | |
parent | 82454b6014a7ee0b048b4db8d64a21de849d4ab9 (diff) |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/image/qicon.cpp
src/gui/image/qicon.h
src/gui/image/qicon_p.h
src/gui/text/qfontdatabase.cpp
src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
sync.profile
Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
Diffstat (limited to 'sync.profile')
-rw-r--r-- | sync.profile | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/sync.profile b/sync.profile index db108cb833..6d88cedc35 100644 --- a/sync.profile +++ b/sync.profile @@ -69,50 +69,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 = ( - "QtCore" => { - }, - "QtOpenGL" => { - "QtCore" => "THIS_REPOSITORY", - "QtGui" => "THIS_REPOSITORY", - "QtWidgets" => "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", - }, - "QtWidgets" => { - "QtCore" => "THIS_REPOSITORY", - "QtGui" => "THIS_REPOSITORY", - }, - "QtUiTools" => { - "QtCore" => "THIS_REPOSITORY", - "QtGui" => "THIS_REPOSITORY", - "QtWidgets" => "THIS_REPOSITORY", - }, - "QtPlatformSupport" => { - "QtCore" => "THIS_REPOSITORY", - "QtGui" => "THIS_REPOSITORY", - }, ); |