diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-09 13:10:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-09 13:10:25 (GMT) |
| commit | 2243b39550f4c3a2880220bb852db5e4b3581bb1 (patch) | |
| tree | 9e6ec991c387df57fbbd05058054ef31ddc1588b /examples | |
| parent | 1b5b012b4b6a09d3dd1d16129bc2ebcf05a77f55 (diff) | |
| parent | 24c06f644ce04610ad010412b64bc1dc7443c639 (diff) | |
| download | Qt-2243b39550f4c3a2880220bb852db5e4b3581bb1.zip Qt-2243b39550f4c3a2880220bb852db5e4b3581bb1.tar.gz Qt-2243b39550f4c3a2880220bb852db5e4b3581bb1.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix building of examples with -no-webkit
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/scroller/scroller.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/scroller/scroller.pro b/examples/scroller/scroller.pro index e830745..9a9991a 100644 --- a/examples/scroller/scroller.pro +++ b/examples/scroller/scroller.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = graphicsview \ - plot \ - wheel +SUBDIRS = graphicsview + +contains(QT_CONFIG, webkit):SUBDIRS += plot wheel # install sources.files = *.pro |