diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 18:25:24 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 03:41:37 +0200 |
| commit | cf26eb0812d183fdb731bcf5526083a3fd8ed81a (patch) | |
| tree | 85906c02bfcba59e3fbb8592bd327421ed5ce799 | |
| parent | ac8b26c0b25ef40032a43903efb691b5d653afc2 (diff) | |
remove stale workaround for circular dependency
webkit does not depend on quick1 anymore
Change-Id: I6e813dd773e37c4fed66a8ff096c77365c64fcb2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | qt.pro | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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 |