diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-04 04:56:50 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-04 04:56:50 (GMT) |
| commit | 7fec7ff568659c3816ce26d2d82d59dd372f1166 (patch) | |
| tree | c2546e401f13ba5c55e3311744d83fa68e46f165 /examples/examples.pro | |
| parent | 5783f98ce5e243afbbd4c6a68c80d2dd959520e0 (diff) | |
| parent | f7dfce110c96ef33200abf2dd93b86d3853095e5 (diff) | |
| download | Qt-7fec7ff568659c3816ce26d2d82d59dd372f1166.zip Qt-7fec7ff568659c3816ce26d2d82d59dd372f1166.tar.gz Qt-7fec7ff568659c3816ce26d2d82d59dd372f1166.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic
Conflicts:
src/xmlpatterns/type/qprimitives_p.h
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'examples/examples.pro')
| -rw-r--r-- | examples/examples.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 3678cc0..8941eae 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -45,7 +45,6 @@ contains(QT_CONFIG, multimedia) { contains(QT_CONFIG, script): SUBDIRS += script contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon -contains(QT_CONFIG, webkit): SUBDIRS += webkit embedded:SUBDIRS += qws !wince*:!symbian: { !contains(QT_EDITION, Console):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer |