From ea8879a54208abd512dac09ecec3eacebb617486 Mon Sep 17 00:00:00 2001 From: Jyri Tahtela Date: Tue, 10 Jan 2012 16:54:49 +1000 Subject: Qt5: Enable compilation of qtjsondb by default. Dependency to other modules (qtpim, qtdocgallery, qtsystems) is defined if qtjsondb is checked out. Change-Id: I0e0abc8d30733b9d7c1fdc666cd064fe6809442a Sanity-Review: Qt Sanity Bot Reviewed-by: Rohan McGovern --- qt.pro | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index 00cfbb8e..9a76ecb8 100644 --- a/qt.pro +++ b/qt.pro @@ -116,8 +116,6 @@ module_qtwayland.CONFIG = no_default_target no_default_install module_qtjsondb.subdir = $$IN_PWD/qtjsondb module_qtjsondb.target = module-qtjsondb module_qtjsondb.depends = module_qtbase module_qtdeclarative module_qtxmlpatterns -# not yet enabled by default -module_qtjsondb.CONFIG = no_default_target no_default_install # only qtbase is required to exist. The others may not - but it is the # users responsibility to ensure that all needed dependencies exist, or @@ -147,7 +145,13 @@ exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland -exists(qtjsondb/qtjsondb.pro): SUBDIRS += module_qtjsondb +exists(qtjsondb/qtjsondb.pro) { + SUBDIRS += module_qtjsondb + # These modules do not require qtjsondb, but can use it if it is available + module_qtpim.depends += module_qtjsondb + module_qtdocgallery.depends += module_qtjsondb + module_qtsystems.depends += module_qtjsondb +} exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend exists(qtwebkit/Tools/Scripts/build-webkit) { -- cgit v1.2.3