From 5c207c6c792b016635d0ca79ea1b832037c32c08 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 21 Nov 2016 18:21:47 +0100 Subject: Add a feature for Qt Network This way you can disable support for QtNetwork by specifying -no-feature-network on the configure line. Change-Id: I46217ccc525a9e2c85394ed4eb6db0e2b60b6d86 Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/src.pro | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index 90d7e2b76c..7c7eb7c34a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -124,7 +124,7 @@ src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic src_plugins.subdir = $$PWD/plugins src_plugins.target = sub-plugins -src_plugins.depends = src_sql src_xml src_network +src_plugins.depends = src_sql src_xml src_android.subdir = $$PWD/android @@ -144,7 +144,11 @@ qtConfig(regularexpression):pcre { SUBDIRS += src_corelib src_tools_qlalr TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr win32:SUBDIRS += src_winmain -SUBDIRS += src_network src_sql src_xml src_testlib +SUBDIRS += src_sql src_xml src_testlib +qtConfig(network) { + SUBDIRS += src_network + src_plugins.depends += src_network +} qtConfig(dbus) { force_dbus_bootstrap|qtConfig(private_tests): \ SUBDIRS += src_tools_bootstrap_dbus -- cgit v1.2.3 From 3b609fc76fd6bf72faa52884c039bb0a074b4e72 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 23 Nov 2016 10:12:16 +0100 Subject: Add a feature for Qt Sql This way we can disable it by passing -no-feature-sql to configure. Change-Id: Ia47d72101de0788478997fa1854cedcd1742f6fd Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/src.pro | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index 7c7eb7c34a..fa408d4787 100644 --- a/src/src.pro +++ b/src/src.pro @@ -124,7 +124,7 @@ src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic src_plugins.subdir = $$PWD/plugins src_plugins.target = sub-plugins -src_plugins.depends = src_sql src_xml +src_plugins.depends = src_xml src_android.subdir = $$PWD/android @@ -144,11 +144,15 @@ qtConfig(regularexpression):pcre { SUBDIRS += src_corelib src_tools_qlalr TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr win32:SUBDIRS += src_winmain -SUBDIRS += src_sql src_xml src_testlib +SUBDIRS += src_xml src_testlib qtConfig(network) { SUBDIRS += src_network src_plugins.depends += src_network } +qtConfig(sql) { + SUBDIRS += src_sql + src_plugins.depends += src_sql +} qtConfig(dbus) { force_dbus_bootstrap|qtConfig(private_tests): \ SUBDIRS += src_tools_bootstrap_dbus -- cgit v1.2.3 From f704aba7fc73b75f7bc3a1be962b28859d83e3aa Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 23 Nov 2016 10:14:48 +0100 Subject: Add a feature for Qt Testlib ... so that we can turn it off if we don't want to build it. Change-Id: Ib27386da4754d843d4e4cbb05f9542852efefb88 Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/src.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index fa408d4787..5b353fde09 100644 --- a/src/src.pro +++ b/src/src.pro @@ -144,7 +144,7 @@ qtConfig(regularexpression):pcre { SUBDIRS += src_corelib src_tools_qlalr TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr win32:SUBDIRS += src_winmain -SUBDIRS += src_xml src_testlib +SUBDIRS += src_xml qtConfig(network) { SUBDIRS += src_network src_plugins.depends += src_network @@ -153,6 +153,7 @@ qtConfig(sql) { SUBDIRS += src_sql src_plugins.depends += src_sql } +qtConfig(testlib): SUBDIRS += src_testlib qtConfig(dbus) { force_dbus_bootstrap|qtConfig(private_tests): \ SUBDIRS += src_tools_bootstrap_dbus -- cgit v1.2.3 From 20e0bca834a1cae1816f17ef0dbfe8b74192d8dd Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 23 Nov 2016 10:43:47 +0100 Subject: Add a feature for Qt Xml ... so that we can turn it off if we don't want to build it. Change-Id: Ia330dfa1477bcd2dc8e24eb55400e100fca156b5 Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/src.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index 5b353fde09..c0366f32b6 100644 --- a/src/src.pro +++ b/src/src.pro @@ -124,7 +124,6 @@ src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic src_plugins.subdir = $$PWD/plugins src_plugins.target = sub-plugins -src_plugins.depends = src_xml src_android.subdir = $$PWD/android @@ -144,7 +143,6 @@ qtConfig(regularexpression):pcre { SUBDIRS += src_corelib src_tools_qlalr TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr win32:SUBDIRS += src_winmain -SUBDIRS += src_xml qtConfig(network) { SUBDIRS += src_network src_plugins.depends += src_network @@ -153,6 +151,7 @@ qtConfig(sql) { SUBDIRS += src_sql src_plugins.depends += src_sql } +qtConfig(xml): SUBDIRS += src_xml qtConfig(testlib): SUBDIRS += src_testlib qtConfig(dbus) { force_dbus_bootstrap|qtConfig(private_tests): \ -- cgit v1.2.3