diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-05-12 12:45:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-05 19:05:46 +0000 |
| commit | 935ffc2e5ff2d5ec82eac9277b2396e8c0ad078f (patch) | |
| tree | d16ce2767bf86e1ae5dd05d92d16181f353c0d4a | |
| parent | 5384ff79efab1a68cfb665f1e764d7f5ee73fcba (diff) | |
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 <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | qt.pro | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |