diff options
| author | Romain Pokrzywka <romain@kdab.com> | 2010-05-03 10:20:36 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-05-03 10:20:36 (GMT) |
| commit | 184c2b0ad676a98cfbcd76212178a4b4c29a54f4 (patch) | |
| tree | 979fbde66d4bb22f2dbeb96619316cad2c2f1a0a | |
| parent | bcec71fef776de7440438f78edd949a64d33d041 (diff) | |
| download | Qt-184c2b0ad676a98cfbcd76212178a4b4c29a54f4.zip Qt-184c2b0ad676a98cfbcd76212178a4b4c29a54f4.tar.gz Qt-184c2b0ad676a98cfbcd76212178a4b4c29a54f4.tar.bz2 | |
only add phonon and scripttools dependencies if they're available, otherwise linking will fail
Merge-request: 591
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -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 } |