From ac8b26c0b25ef40032a43903efb691b5d653afc2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 19 Jun 2012 18:24:37 +0200 Subject: fix SUBDIRS sorting according to dependencies again quick1 depends on tools now Change-Id: I1575c03af2e6af1244f75d3c9e72481536d1a913 Reviewed-by: Rohan McGovern --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index c2058334..431805be 100644 --- a/qt.pro +++ b/qt.pro @@ -147,7 +147,6 @@ exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend exists(qtdeclarative/qtdeclarative.pro): SUBDIRS += module_qtdeclarative exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript -exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1 exists(qtjsondb/qtjsondb.pro) { SUBDIRS += module_qtjsondb # These modules do not require qtjsondb, but can use it if it is available @@ -194,6 +193,7 @@ exists(qttools/qttools.pro) { # 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 } +exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1 !win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects -- cgit v1.2.3