adding it to the super cache makes no sense, as that's read before
spec_pre.prf, which clears CONFIG. use the regular cache instead.
submodules do not inherit that setting, and they don't need to as per
comment.
also, don't keep adding it to the cache - the cache() function doesn't
check whether the added value is already present, so we need to do that
manually.
amends 31590c0b65.
Fixes: QTBUG-63452
Change-Id: I608559a80a7c772dbdaacfaaadb4fc268b442c39
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
this suppresses license checking in default_pre.prf in the super module.
submodules set it via their .qmake.conf's.
Change-Id: Ic3599613140169eeacb48385be8f324c4bef8f1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
the handling of -skip happens outside the usual argument handling, so we
need to handle -redo manually as well.
Change-Id: I7dcdf729bd9db2ff2ac8dc08bac71462bf30814b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Conflicts:
.gitmodules
qt.pro
Commit ed8f84f149 (webengine needs tools)
together with commit 5656b4848e (webkit
needs webengine) creates a circular dependency with qttools also
depending on webkit. So this commit breaks it by swapping the
serialization order between webkit and webengine.
Change-Id: I36309908adb754072495e02785ad158f8b389548
linking both at the same time requires more than my 16GB of RAM, so
introduce a .gitmodules field which serializes the two.
in practice, it is just interpreted as an optional dependency. the CI
system won't be taught about it, so this will not cause an unnecessary
serialization there.
Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
These exclusions belong in the individual modules.
Change-Id: Iaa868bf953f7bc3d72b6508272a18798a8569f4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
this includes moving the -skip option here, where it belongs.
the implementation is a bit hacky, but the proper one would be vastly
more complex: we'd have to load all modules, then parse the command
line properly (the -skip parsing would be a custom callback, to avoid
needing to process features), then discard all now excluded modules
again, then re-process the command line (so we can complain about
options which are now invalid), and only now proceed with the actual
feature processing.
that seems a bit over the top, so we accept that -skip cannot be the
argument of another option, which seems quite reasonable.
Change-Id: I0053658e6d7e11b82cdfe55893cb553b664a9298
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
this removes the last redundant module list.
the module build order which is not determined by dependencies is pretty
random now. this is avoided for a few heavy and "less relevant" modules
by setting a priority to built them as late as possible.
Change-Id: Ie8ef9777d050a4915cd2282dc9ccb48fcdbc02d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
we want to move to a purely declarative way to declare submodules, so
the conditional has to go.
instead, use an optional dependency to ensure build order, while the
module excludes itself via requires() if its dependency is missing.
Change-Id: I615382700ff601c9ab003d131b2cc600441c514c
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
The current way requires passing -skip to configure, which is a list
of what not to build. To set a list of what to build (e.g., for
testing, in a specialized build, etc.), there was no way. Now you can
just do:
qmake "QT_BUILD_MODULES=qtbase qtdeclarative qtsvg qtxmlpatterns"
(the order doesn't matter)
Change-Id: Ifcaefa35b16b137866ca839a483ce366e35de7ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
For 5.6 this is a tech preview, it will be added properly in 5.7.
Change-Id: I709830fbcfc439d5446718093f0c16ad2dcb1e57
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
QtWebkit (and QtWebkit-Examples) were deprecated in Qt 5.5 and will now
be removed from qt5.git in Qt5.6 release
Change-Id: I86e1072141956136fa5e4220cdcdf812492453b3
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This is a prerequisite to making qtgraphicaleffects a dependency in
qtquickcontrols' sync.profile.
Task-number: QTBUG-46393
Change-Id: I3679392a7feb48ecefa4a01a7ecb42b2e6287ecb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
With the correct modules checked out 'make module-qtlocation' will build
everything necessary to run the examples.
Change-Id: I0c63221b5704c2b13495f3dc3221e888d8e9547c
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
This way qtwebkit can be built when qtdeclarative is disabled. This is
especially useful for targets without OpenGL.
Also add qtxmlpatterns to the optional dependencies. It was an indirect
dependency before via qtdeclarative.
Change-Id: Ib4c29b958bd63d528fba8ec326e2dbc1ea8bce08
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
[ChangeLog][General] Added QtCanvas3D module, a JavaScript 3D rendering API for QtQuick.
Change-Id: I9448f87ba8c8ccfb2dd6cf790d29bb561b9e9740
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
To allow using the integration that makes use of a custom transport over
Chromium IPC.
Also add QtLocation as an optional dependency for correctness, and
update the pinned sha1
Change-Id: I71d88be0859a74ad82f539d00f02b51d1c3e5218
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Qt3D makes use of the webp image format in its examples to minimize
the size of assets. Support for webp is provided by qtimageformats.
Change-Id: Id70b584123dc6174848947029ee034593ccc42e0
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
qtwebkit is listed as an optional dependency for
qtwebengine to ensure that qtwebkit and qtwebengine
are not linked in parallel on the CI system.
Otherwise we could run out of memory.
Change-Id: Ib80d72407df03037c928d99f55c8e04e98e506d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
This is required to prepare the merge of the integration patch.
The QtWebChannel and QtWebSockets lines in qt.pro are moved such
that they occur before their first use in QtWebKit.
Change-Id: Ie8137da57827776fe7b1434538df6b08108b0349
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
This also updates the qtwebsockets revision since
that's needed to compile.
Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
it's a soft dependency and it appears to be properly checked in the
subprojects.
Task-number: QTBUG-38616
Change-Id: I5ada1f91247ba3668015e95d6da9c5996f1a138c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
QtLocation no longer depends on Qt3D.
Change-Id: I0418dcc93a97722948bddcdd4f754914d7eaa019
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
our CONFIG+=build_pass hack has the side effect that qmake does not emit
the calling command line to the makefile, which makes creator unable to
detect the build. so revert the hack as soon as it did its deed.
Task-number: QTBUG-34788
Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
QtWebKit should be build after QtMultimedia for multimedia support on Mac
and Windows.
QtScript should be build after QtTools because an example uses UiTools.
Change-Id: Id92efac72d8c2c2237f21fad1ab823c1c1ac95dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Remove the hard dependency on qtsystems and changing it
with a hard dependency on qtbase and a optional dependency
on qtdeclarative instead.
Change-Id: I96a4d3b38df588489e5ff4a704ea1e4fcbdb620c
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
