From cf26eb0812d183fdb731bcf5526083a3fd8ed81a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 19 Jun 2012 18:25:24 +0200 Subject: [PATCH] remove stale workaround for circular dependency webkit does not depend on quick1 anymore Change-Id: I6e813dd773e37c4fed66a8ff096c77365c64fcb2 Reviewed-by: Rohan McGovern --- qt.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qt.pro b/qt.pro index 431805be..dcca1b74 100644 --- a/qt.pro +++ b/qt.pro @@ -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