lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-05 16:06:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix dependencies between quick1 and tools

Browse Source 
Change-Id: I80ace901a2fc57f72ce9bb1d20cfa90f3faa1870
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Lars Knoll
2012-06-11 14:53:13 +02:00
committed by Qt by Nokia
parent 93310ed069
commit ed97a0d3b9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qt.pro
View File

@@ -116,7 +116,7 @@ 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
@@ -183,8 +183,8 @@ exists(qtactiveqt/qtactiveqt.pro) {
}
exists(qttools/qttools.pro) {
SUBDIRS += module_qttools
# disable this for now to avoid a circula dependency quick1 -> tools -> webkit -> quick1
# module_qtquick1.depends += module_qttools
# disable this for now when webkit is there to avoid a circula dependency quick1 -> tools -> webkit -> quick1
!exists(qtwebkit/Tools/Scripts/build-webkit):module_qtquick1.depends += module_qttools
}
!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats