summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-06-17 16:45:01 +0200
committerAllan Sandfeld Jensen <allan.jensen@digia.com>2014-06-24 19:31:09 +0200
commit166cde70a231662c77cbbd7db172b96fa4e31a2e (patch)
tree087676c52308a6b3d02e06f8b9f7c88f3dc303bb
parentf93fec1adcff7cb2afd1cbe4d3417983d9349257 (diff)
Qt5WebKitWidgets should keep private dependencies private
The qmake file webkit_modules was not loaded, which meant we never separated private Qt dependencies from public Qt dependencies in the QT qmake variable. Task-number: QTBUG-39249 Change-Id: Iadad6b652cee5a51894c4ac2e9979d7d41619d27 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
-rw-r--r--Source/widgetsapi.pri4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/widgetsapi.pri b/Source/widgetsapi.pri
index a92fbeac1..1730a4ec2 100644
--- a/Source/widgetsapi.pri
+++ b/Source/widgetsapi.pri
@@ -59,6 +59,10 @@ MODULE_BASE_OUTDIR = $$ROOT_BUILD_DIR
# the QtWebKitWidgets library, and will end up in the library's prl file.
QT_API_DEPENDS = core gui widgets network webkit
+# We load the relevant modules here, so that the effects of each module
+# on the QT variable can be picked up when we later load(qt_module).
+load(webkit_modules)
+
# ---------------- Custom developer-build handling -------------------
#
# The assumption for Qt developer builds is that the module file