diff options
| author | Corentin Jabot <corentinjabot@gmail.com> | 2012-07-30 11:36:21 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-08 23:18:52 +0200 |
| commit | 9b19587959a7ec576604377020a20e5e18c9dd33 (patch) | |
| tree | ff6a3a80f8bb9aa2ea1cf8a9420fdf625afcead2 /build.dependencies | |
| parent | 34904ca89dbda946e557121ad4f58ac0f9777d9b (diff) | |
Cut some build dependencies
A lot of modules had a hard depency on qtdeclarative
(for extra qml components or qml examples).
Now, these modules can be build without the need of qtdeclarative.
These modules are:
qttools (since 3b9ac2dc08310aa13b121274afea130fa4f7c6f8 )
qtmultimedia (since 02f144ba6f50bb7d404e2808b9bb4fa32a206aea )
qtsystems (since 12408d021af8b9f8e0afad7ae67f389974ed0607 )
qtlocation (since fa404bfb7a83ecb01deb4df16d5ac72a8c5ab066 )
qtsensors ( since 3c069e5e4a720582f37f0b2d053d19632f6ddfe2 )
Also, useless dependencies are cut, and the dependencies declared
in build.dependencis mirror more accurately what is done is qt.pro
Those modifications allow an easier and faster build for people who
do not use qml.
Note that qtdelarative will still be needed to build the tests
of each of the modules listed above
Change-Id: Icf7711c07d041b8ef836f213fadeebb9328877d5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'build.dependencies')
| -rw-r--r-- | build.dependencies | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build.dependencies b/build.dependencies index 80c219b6..a979bf03 100644 --- a/build.dependencies +++ b/build.dependencies @@ -17,16 +17,16 @@ use Config; "qtgraphicaleffects" => "qtbase,qtdeclarative,qtxmlpatterns", "qtimageformats" => "qtbase", "qtjsbackend" => "qtbase", - "qtlocation" => "qtbase,qtdeclarative,qt3d", - "qtmultimedia" => "qtbase,qtdeclarative", + "qtlocation" => "qtbase,qtdeclarative:s,qt3d", + "qtmultimedia" => "qtbase,qtdeclarative:s", "qtpim" => "qtdeclarative", "qtqa" => "qtbase", "qtquick1" => "qtbase,qtscript,qtxmlpatterns,qttools,qtsvg:s", "qtscript" => "qtbase", - "qtsensors" => "qtbase,qtdeclarative", + "qtsensors" => "qtbase,qtdeclarative:s", "qtsvg" => "qtbase", - "qtsystems" => "qtbase,qtdeclarative", - "qttools" => "qtbase,qtdeclarative,qtwebkit:s", + "qtsystems" => "qtbase,qtdeclarative:s", + "qttools" => "qtbase,qtdeclarative:s,qtwebkit:s", "qttranslations" => "qttools", "qtwebkit" => "qtbase,qtscript,qtdeclarative,qtquick1,qtlocation", "qtwebkit-examples-and-demos" => "qtwebkit", @@ -55,7 +55,7 @@ if ("$Config{osname}" =~ /mswin/i) { # Platform specific modules if ("$Config{osname}" =~ /linux/i) { - $build_dependencies{"qtwayland"} = "qtbase,qtdeclarative"; + $build_dependencies{"qtwayland"} = "qtbase,qtdeclarative:s"; } if ("$Config{osname}" =~ /(ms|cyg)win/i) { |