qtdeclarative is an optional dependency for qtwebkit 5.5_1433533840 05/112205/4
authorMichael Olbrich <m.olbrich@pengutronix.de>
Tue, 12 May 2015 10:45:10 +0000 (12:45 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Fri, 5 Jun 2015 19:05:46 +0000 (19:05 +0000)
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>
qt.pro

diff --git a/qt.pro b/qt.pro
index 6876dfb..1d00bf3 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -76,7 +76,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative)
 addModule(qtwebsockets, qtbase, qtdeclarative)
 addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets)
-addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors qtwebchannel, WebKit.pro)
+addModule(qtwebkit, qtbase, qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns, WebKit.pro)
 addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
 addModule(qtwebkit-examples, qtwebkit qttools)
 addModule(qtimageformats, qtbase)