lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Introduce dependency: QtQuick1 needs QtWebKit

Browse Source 
The QML1 WebKit integration is moved to the QtQuick1 module, so this
dependency needs to be expressed in qt.pro.

It is technically an optional dependency, because the module can be built
without, but if WebKit is available then it should be built before QtQuick1.

Change-Id: Iae69339827afe6449a7af8fd6ae7de62632f30ed
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Simon Hausmann
2012-09-25 10:55:33 +02:00
committed by The Qt Project
parent a2d6af491e
commit e4d841490b
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qt.pro
View File

@@ -175,6 +175,7 @@ exists(qtwebkit/WebKit.pro) {
mac|contains(QT_CONFIG, icu) {
SUBDIRS += module_qtwebkit
module_qttools.depends += module_qtwebkit
module_qtquick1.depends += module_qtwebkit
exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro) {
SUBDIRS += module_qtwebkit_examples_and_demos
}