diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-04 00:09:14 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-04 00:09:14 (GMT) |
| commit | 536d0f141a13474122f99daf98bf6b54e635b474 (patch) | |
| tree | 7f0219f0625f20b2678c344f6c5e97dff3bc8a59 /tools/qml | |
| parent | e0c8fc977738ca4ac6d31e45bdd2aa1b32828f54 (diff) | |
| parent | bec679624c642fb9914c8c43672c249ab0c1ab4c (diff) | |
| download | Qt-536d0f141a13474122f99daf98bf6b54e635b474.zip Qt-536d0f141a13474122f99daf98bf6b54e635b474.tar.gz Qt-536d0f141a13474122f99daf98bf6b54e635b474.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/qml.pro | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 7a101d0..b33d48b 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -14,10 +14,14 @@ target.path = $$[QT_INSTALL_BINS] INSTALLS += target wince* { -QT += scripttools \ - xml \ - phonon + QT += xml + contains(QT_CONFIG, scripttools) { + QT += scripttools + } + contains(QT_CONFIG, phonon) { + QT += phonon + } contains(QT_CONFIG, xmlpatterns) { QT += xmlpatterns } |