diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-05-03 11:32:16 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-05-03 11:32:16 (GMT) |
| commit | 7cdfc35b5601b5612f4baa6d3905f2b957091dd0 (patch) | |
| tree | dd472b70d24b95126e93128fb84f644c2ef5fcaf /tools | |
| parent | b2e7709b55559ca20f627dff443b517421892779 (diff) | |
| parent | c8e08e5c74fbdae8a60bdd9b08966ea7fc728845 (diff) | |
| download | Qt-7cdfc35b5601b5612f4baa6d3905f2b957091dd0.zip Qt-7cdfc35b5601b5612f4baa6d3905f2b957091dd0.tar.gz Qt-7cdfc35b5601b5612f4baa6d3905f2b957091dd0.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools')
| -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 } |