summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-01-27 08:53:40 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-01-27 08:53:40 (GMT)
commitfdd5a4f3c18b47826ebe63d8753cd27164ad8169 (patch)
treec78d347f4fe576288a95e8239bbca2da99f0626e /src/src.pro
parentaebc34877fb17405e8e5915760012a82d0178b97 (diff)
parent35386ae28887d56cf6fd6f6cc7ceaf0506abe18a (diff)
downloadQt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.zip
Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.tar.gz
Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/src.pro b/src/src.pro
index 8dec49b..f2070ae 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -106,6 +106,7 @@ src_declarative.target = sub-declarative
contains(QT_CONFIG, webkit) {
src_webkit.depends = src_gui src_sql src_network src_xml
contains(QT_CONFIG, phonon):src_webkit.depends += src_phonon
+ contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns
contains(QT_CONFIG, declarative):src_declarative.depends += src_webkit
#exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore
}