diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-06-29 06:34:50 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-06-29 06:34:50 (GMT) |
commit | 37229d77646347db089553a82c44ef0d52eb36c7 (patch) | |
tree | 69cadd76390bcbcdbe7b6e0174fdea86dcaca127 /examples | |
parent | 6a8f5753a1b04e3678c387a52c8f4c2820ef1b2b (diff) | |
parent | 90a37877c1c7ddec13ea7a1ae40c1a6b9be1ea83 (diff) | |
download | Qt-37229d77646347db089553a82c44ef0d52eb36c7.zip Qt-37229d77646347db089553a82c44ef0d52eb36c7.tar.gz Qt-37229d77646347db089553a82c44ef0d52eb36c7.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'examples')
-rw-r--r-- | examples/gestures/gestures.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/gestures/gestures.pro b/examples/gestures/gestures.pro index 40809bb..d0735ae 100644 --- a/examples/gestures/gestures.pro +++ b/examples/gestures/gestures.pro @@ -3,8 +3,7 @@ TEMPLATE = \ SUBDIRS = \ imageviewer \ graphicsview \ - collidingmice \ - pannablewebview + collidingmice contains(QT_CONFIG, webkit) { SUBDIRS += pannablewebview |