From 935ffc2e5ff2d5ec82eac9277b2396e8c0ad078f Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Tue, 12 May 2015 12:45:10 +0200 Subject: qtdeclarative is an optional dependency for qtwebkit 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 Reviewed-by: Allan Sandfeld Jensen --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index 6876dfba..1d00bf38 100644 --- 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) -- cgit v1.2.3