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

remove stale workaround for circular dependency

Browse Source 
webkit does not depend on quick1 anymore

Change-Id: I6e813dd773e37c4fed66a8ff096c77365c64fcb2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-19 18:25:24 +02:00
committed by Qt by Nokia
parent ac8b26c0b2
commit cf26eb0812
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qt.pro
View File

@@ -190,8 +190,7 @@ exists(qtactiveqt/qtactiveqt.pro) {
}
exists(qttools/qttools.pro) {
SUBDIRS += 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
module_qtquick1.depends += module_qttools
}
exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland