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

qt.pro: update modules dependency on qtxmlpatterns

Browse Source 
remove the dependency from qtjsondb and qtgraphicaleffects
change qtdeclarative and qtquick1 dependency on it to optional

Change-Id: I6d1b60417d54c378c018d20d48fa6ce45776fbda
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
This commit is contained in:
Tasuku Suzuki
2012-05-24 20:06:48 +09:00
committed by Qt by Nokia
parent fa716b77c1
commit 5c14da5a7b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
qt.pro
View File

@@ -25,7 +25,7 @@ module_qtjsbackend.depends = module_qtbase
module_qtdeclarative.subdir = qtdeclarative
module_qtdeclarative.target = module-qtdeclarative
module_qtdeclarative.depends = module_qtbase module_qtxmlpatterns module_qtjsbackend
module_qtdeclarative.depends = module_qtbase module_qtjsbackend
module_qtwebkit.file = qtwebkit.pri
module_qtwebkit.makefile = Makefile.qtwebkit
@@ -108,7 +108,7 @@ module_qtwayland.CONFIG = no_default_target no_default_install
module_qtjsondb.subdir = qtjsondb
module_qtjsondb.target = module-qtjsondb
module_qtjsondb.depends = module_qtbase module_qtdeclarative module_qtxmlpatterns
module_qtjsondb.depends = module_qtbase module_qtdeclarative
module_qtimageformats.subdir = qtimageformats
module_qtimageformats.target = module-qtimageformats
@@ -116,11 +116,11 @@ module_qtimageformats.depends = module_qtbase
module_qtquick1.subdir = qtquick1
module_qtquick1.target = module-qtquick1
module_qtquick1.depends = module_qtbase module_qtscript module_qtxmlpatterns
module_qtquick1.depends = module_qtbase module_qtscript
module_qtgraphicaleffects.subdir = qtgraphicaleffects
module_qtgraphicaleffects.target = module-qtgraphicaleffects
module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative module_qtxmlpatterns
module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative
# not yet enabled by default
module_qtgraphicaleffects.CONFIG = no_default_target no_default_install
@@ -136,7 +136,13 @@ exists(qtsvg/qtsvg.pro) {
module_qtdeclarative.depends += module_qtsvg
module_qtquick1.depends += module_qtsvg
}
exists(qtxmlpatterns/qtxmlpatterns.pro): SUBDIRS += module_qtxmlpatterns
exists(qtxmlpatterns/qtxmlpatterns.pro) {
SUBDIRS += module_qtxmlpatterns
# These modules do not require qtxmlpatterns, but can use it if it is available
module_qtdeclarative.depends += module_qtxmlpatterns
module_qtquick1.depends += module_qtxmlpatterns
}
exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
exists(qtdeclarative/qtdeclarative.pro): SUBDIRS += module_qtdeclarative
exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d