From 008943132609e1a92e500decf391bc75da320d2f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Feb 2013 10:39:57 +0100 Subject: don't make webkit build conditional on ICU webkit now contains its own configure magic to disable itself. Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855 Reviewed-by: Simon Hausmann --- qt.pro | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index bcf2f6af..0d118de0 100644 --- a/qt.pro +++ b/qt.pro @@ -106,15 +106,11 @@ exists(qtactiveqt/qtactiveqt.pro) { module_qttools.depends += module_qtactiveqt } exists(qtwebkit/WebKit.pro) { - mac|contains(QT_CONFIG, icu) { - SUBDIRS += module_qtwebkit - module_qttools.depends += module_qtwebkit - module_qtquick1.depends += module_qtwebkit - exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro) { - SUBDIRS += module_qtwebkit_examples_and_demos - } - } else { - message("WebKit: Qt was built without ICU support, WebKit disabled.") + SUBDIRS += module_qtwebkit + module_qttools.depends += module_qtwebkit + module_qtquick1.depends += module_qtwebkit + exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro) { + SUBDIRS += module_qtwebkit_examples_and_demos } } exists(qttools/qttools.pro) { -- cgit v1.2.3 From aeed8ce504b47985ef317f2cfcd6f715916303fb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Feb 2013 10:33:49 +0100 Subject: semi-automate adding submodules this way adding a module actually becomes a one-liner Change-Id: Ie31039d36e948094c3ec241758eaab330304b194 Reviewed-by: Simon Hausmann --- qt.pro | 159 +++++++++++++++++++++-------------------------------------------- 1 file changed, 50 insertions(+), 109 deletions(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index 0d118de0..9614e433 100644 --- a/qt.pro +++ b/qt.pro @@ -5,121 +5,62 @@ TEMPLATE = subdirs CONFIG += prepare_docs qt_docs_targets testcase_targets -module_qtbase.subdir = qtbase -module_qtbase.target = module-qtbase - -module_qtsvg.subdir = qtsvg -module_qtsvg.target = module-qtsvg -module_qtsvg.depends = module_qtbase - -module_qtxmlpatterns.subdir = qtxmlpatterns -module_qtxmlpatterns.target = module-qtxmlpatterns -module_qtxmlpatterns.depends = module_qtbase - -module_qtscript.subdir = qtscript -module_qtscript.target = module-qtscript -module_qtscript.depends = module_qtbase - -module_qtjsbackend.subdir = qtjsbackend -module_qtjsbackend.target = module-qtjsbackend -module_qtjsbackend.depends = module_qtbase - -module_qtdeclarative.subdir = qtdeclarative -module_qtdeclarative.target = module-qtdeclarative -module_qtdeclarative.depends = module_qtbase module_qtjsbackend - -module_qtwebkit.file = qtwebkit/WebKit.pro -module_qtwebkit.makefile = Makefile -module_qtwebkit.depends = module_qtbase module_qtdeclarative -module_qtwebkit.target = module-qtwebkit - -module_qtwebkit_examples_and_demos.subdir = qtwebkit-examples-and-demos -module_qtwebkit_examples_and_demos.target = module-qtwebkit-examples-and-demos -module_qtwebkit_examples_and_demos.depends = module_qtwebkit module_qttools - -module_qttools.subdir = qttools -module_qttools.target = module-qttools -module_qttools.depends = module_qtbase - -module_qttranslations.subdir = qttranslations -module_qttranslations.target = module-qttranslations -module_qttranslations.depends = module_qttools - -module_qtdoc.subdir = qtdoc -module_qtdoc.target = module-qtdoc -module_qtdoc.depends = module_qtbase module_qtdeclarative - -module_qtactiveqt.subdir = qtactiveqt -module_qtactiveqt.target = module-qtactiveqt -module_qtactiveqt.depends = module_qtbase - -module_qtqa.subdir = qtqa -module_qtqa.target = module-qtqa -module_qtqa.depends = module_qtbase +defineReplace(moduleName) { + return(module_$$replace(1, -, _)) +} -module_qtmultimedia.subdir = qtmultimedia -module_qtmultimedia.target = module-qtmultimedia -module_qtmultimedia.depends = module_qtbase +# Arguments: module name, [mandatory deps], [optional deps], [project file] +defineTest(addModule) { + mod = $$moduleName($$1) + + isEmpty(4) { + !exists($$1/$${1}.pro): return(false) + $${mod}.subdir = $$1 + export($${mod}.subdir) + } else { + !exists($$1/$${4}): return(false) + $${mod}.file = $$1/$$4 + $${mod}.makefile = Makefile + export($${mod}.file) + export($${mod}.makefile) + } -module_qtimageformats.subdir = qtimageformats -module_qtimageformats.target = module-qtimageformats -module_qtimageformats.depends = module_qtbase + for(d, 2): \ + $${mod}.depends += $$moduleName($$d) + for(d, 3) { + dn = $$moduleName($$d) + contains(SUBDIRS, $$dn): \ + $${mod}.depends += $$dn + } + !isEmpty($${mod}.depends): \ + export($${mod}.depends) -module_qtquick1.subdir = qtquick1 -module_qtquick1.target = module-qtquick1 -module_qtquick1.depends = module_qtbase module_qtscript + $${mod}.target = module-$$1 + export($${mod}.target) -module_qtgraphicaleffects.subdir = qtgraphicaleffects -module_qtgraphicaleffects.target = module-qtgraphicaleffects -module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative + SUBDIRS += $$mod + export(SUBDIRS) + return(true) +} # only qtbase is required to exist. The others may not - but it is the # users responsibility to ensure that all needed dependencies exist, or # it may not build. -SUBDIRS = module_qtbase - -exists(qtsvg/qtsvg.pro) { - SUBDIRS += module_qtsvg - # These modules do not require qtsvg, but can use it if it is available - module_qtdeclarative.depends += module_qtsvg - module_qtquick1.depends += module_qtsvg -} -exists(qtxmlpatterns/qtxmlpatterns.pro) { - SUBDIRS += module_qtxmlpatterns - # These modules do not require qtxmlpatterns, but can use it if it is available - module_qtdeclarative.depends += module_qtxmlpatterns - module_qtquick1.depends += module_qtxmlpatterns -} - -exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend -exists(qtdeclarative/qtdeclarative.pro) { - SUBDIRS += module_qtdeclarative - # These modules do not require qtdeclarative, but can use it if it is available - module_qttools.depends += module_qtdeclarative - module_qtmultimedia.depends += module_qtdeclarative -} -exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript -exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia -exists(qtactiveqt/qtactiveqt.pro) { - SUBDIRS += module_qtactiveqt - module_qttools.depends += module_qtactiveqt -} -exists(qtwebkit/WebKit.pro) { - SUBDIRS += module_qtwebkit - module_qttools.depends += module_qtwebkit - module_qtquick1.depends += module_qtwebkit - exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro) { - SUBDIRS += module_qtwebkit_examples_and_demos - } -} -exists(qttools/qttools.pro) { - SUBDIRS += module_qttools - module_qtquick1.depends += module_qttools -} -exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1 -exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats -exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects -exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations -exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc -exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa +addModule(qtbase) +addModule(qtsvg, qtbase) +addModule(qtxmlpatterns, qtbase) +addModule(qtjsbackend, qtbase) +addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns) +addModule(qtmultimedia, qtbase, qtdeclarative) +addModule(qtactiveqt, qtbase) +addModule(qtwebkit, qtdeclarative, , WebKit.pro) +addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) +addModule(qtwebkit-examples-and-demos, qtwebkit qttools) +addModule(qtimageformats, qtbase) +addModule(qtgraphicaleffects, qtdeclarative) +addModule(qtscript, qtbase) +addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) +addModule(qttranslations, qttools) +addModule(qtdoc, qtdeclarative) +addModule(qtqa, qtbase) -- cgit v1.2.3 From 08ec2c7a620de84591552b57e396fe3fd404418c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Feb 2013 10:36:36 +0100 Subject: make it possible to explicitly exclude particular modules Task-number: QTBUG-26697 Change-Id: Id3f091be5803d922e129e6c3b5d9dfcdd297d18f Reviewed-by: Simon Hausmann --- qt.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index 9614e433..91151678 100644 --- a/qt.pro +++ b/qt.pro @@ -1,9 +1,10 @@ # Create the super cache so modules will add themselves to it. cache(, super) -TEMPLATE = subdirs +CONFIG += build_pass # hack to disable the .qmake.super auto-add +load(qt_build_config) -CONFIG += prepare_docs qt_docs_targets testcase_targets +TEMPLATE = subdirs defineReplace(moduleName) { return(module_$$replace(1, -, _)) @@ -11,6 +12,7 @@ defineReplace(moduleName) { # Arguments: module name, [mandatory deps], [optional deps], [project file] defineTest(addModule) { + contains(QT_SKIP_MODULES, $$1): return(false) mod = $$moduleName($$1) isEmpty(4) { -- cgit v1.2.3 From 66ed87fc6792a285430e88d8a9de496a532df8d8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 14:07:32 +0100 Subject: re-add a bunch of modules this allows for easy cloning and build system maintenance also for modules which are currently irrelevant, thus hopefully keeping the barrier to their revival low. it does not affect the casual developer or the CI system, as init-repository will not clone these modules. This (abstractly) reverts commits 41c3f2cb5f633f0e540482ca01b2c2caa2475e57, 725a51b1d83626e16989804707356baa909c339f and 1117d4da2caf1989f63ca0a8073a799df80428bc. Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094 Reviewed-by: Sergio Ahumada --- qt.pro | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index 91151678..7d1a78b8 100644 --- a/qt.pro +++ b/qt.pro @@ -50,19 +50,30 @@ defineTest(addModule) { # it may not build. addModule(qtbase) +addModule(qlalr, qtbase) addModule(qtsvg, qtbase) addModule(qtxmlpatterns, qtbase) addModule(qtjsbackend, qtbase) addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns) -addModule(qtmultimedia, qtbase, qtdeclarative) +addModule(qtmultimedia, qtdeclarative) addModule(qtactiveqt, qtbase) -addModule(qtwebkit, qtdeclarative, , WebKit.pro) +addModule(qt3d, qtdeclarative) +addModule(qtjsondb, qtdeclarative) +addModule(qtsystems, qtbase, qtdeclarative qtjsondb) +addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia) +addModule(qtsensors, qtbase, qtdeclarative) +addModule(qtconnectivity, qtsystems) +addModule(qtfeedback, qtdeclarative, qtmultimedia) +addModule(qtpim, qtdeclarative, qtjsondb) +addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro) addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) addModule(qtwebkit-examples-and-demos, qtwebkit qttools) addModule(qtimageformats, qtbase) addModule(qtgraphicaleffects, qtdeclarative) addModule(qtscript, qtbase) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) +addModule(qtdocgallery, qtdeclarative, qtjsondb) +!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) -- cgit v1.2.3 From 80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 4 Apr 2013 07:37:42 +0200 Subject: Add new modules (qtquickcontrols, qtserialport and qtx11extras) Also adding qtsensors as part of the default modules and updating its sha1. Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da Reviewed-by: David Faure (KDE) --- qt.pro | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index 7d1a78b8..3baaf6a5 100644 --- a/qt.pro +++ b/qt.pro @@ -50,11 +50,13 @@ defineTest(addModule) { # it may not build. addModule(qtbase) +addModule(qtx11extras, qtbase) addModule(qlalr, qtbase) addModule(qtsvg, qtbase) addModule(qtxmlpatterns, qtbase) addModule(qtjsbackend, qtbase) addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns) +addModule(qtquickcontrols, qtdeclarative) addModule(qtmultimedia, qtdeclarative) addModule(qtactiveqt, qtbase) addModule(qt3d, qtdeclarative) @@ -74,6 +76,7 @@ addModule(qtscript, qtbase) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) addModule(qtdocgallery, qtdeclarative, qtjsondb) !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) +addModule(qtserialport, qtbase) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) -- cgit v1.2.3 From 7b034fec34f488b6d77e97776ad0604b69dbf623 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 17 Apr 2013 11:25:38 +0200 Subject: skip modules whose mandatory dependencies are missing so that for example "-skip webkit" will also skip qtwebkit-examples. Task-number: QTBUG-30307 Change-Id: I730830781ea5dabdccab88d19e82165f30dca8fe Reviewed-by: Joerg Bornemann Reviewed-by: Mitch Curtis --- qt.pro | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index 3baaf6a5..33a9469e 100644 --- a/qt.pro +++ b/qt.pro @@ -27,8 +27,12 @@ defineTest(addModule) { export($${mod}.makefile) } - for(d, 2): \ - $${mod}.depends += $$moduleName($$d) + for(d, 2) { + dn = $$moduleName($$d) + !contains(SUBDIRS, $$dn): \ + return(false) + $${mod}.depends += $$dn + } for(d, 3) { dn = $$moduleName($$d) contains(SUBDIRS, $$dn): \ -- cgit v1.2.3 From 730e330068b4d2bc6098a8a4dbbd7fb98aef5452 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 30 Apr 2013 11:23:38 +0200 Subject: renamed qtwebkit-examples-and-demos => qtwebkit-examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21 Reviewed-by: Sergio Ahumada Reviewed-by: Simo Fält --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index 33a9469e..218701ab 100644 --- a/qt.pro +++ b/qt.pro @@ -73,7 +73,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtpim, qtdeclarative, qtjsondb) addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro) addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) -addModule(qtwebkit-examples-and-demos, qtwebkit qttools) +addModule(qtwebkit-examples, qtwebkit qttools) addModule(qtimageformats, qtbase) addModule(qtgraphicaleffects, qtdeclarative) addModule(qtscript, qtbase) -- cgit v1.2.3