diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 11:39:21 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 11:39:21 +0100 |
commit | 3aca005d4721b82446922310496271ebe206a0d7 (patch) | |
tree | f71298b19bd98c6b3751bc9009b2fdb49c2ad526 /examples/webkit/webkit.pro | |
parent | 6088336d9237eaa94def8c2a83901b547e682abb (diff) | |
parent | 48e08ee5718b3de855ecea626179ad5323e38fa0 (diff) | |
download | qt4-tools-3aca005d4721b82446922310496271ebe206a0d7.tar.gz |
Merge remote branch 'mainline/4.6' into 4.6
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
Diffstat (limited to 'examples/webkit/webkit.pro')
-rw-r--r-- | examples/webkit/webkit.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/webkit/webkit.pro b/examples/webkit/webkit.pro index c985ed58f5..76c880106f 100644 --- a/examples/webkit/webkit.pro +++ b/examples/webkit/webkit.pro @@ -3,7 +3,8 @@ SUBDIRS += domtraversal \ formextractor \ previewer \ fancybrowser \ - simpleselector + simpleselector \ + framecapture contains(QT_CONFIG, openssl):SUBDIRS += googlechat |