diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-03 10:36:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-03 10:36:16 (GMT) |
| commit | 9b77de3effdb2eb7d6df212ab9a8a19551ecb550 (patch) | |
| tree | b805d65324498a377e3732c5ca3615df0f1c7750 /tools/qml/qml.pro | |
| parent | 32ecf8e8ad326ea13ec9a430c99ce540e8b4efac (diff) | |
| parent | cfa3b8f2a7a3b3122fdff7781e32066e0d7f8d66 (diff) | |
| download | Qt-9b77de3effdb2eb7d6df212ab9a8a19551ecb550.zip Qt-9b77de3effdb2eb7d6df212ab9a8a19551ecb550.tar.gz Qt-9b77de3effdb2eb7d6df212ab9a8a19551ecb550.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a small typo: therfore -> therefore
Fix a small typo in setColor description (brush -> color)
only add phonon and scripttools dependencies if they're available, otherwise linking will fail
s/INCPATH/INCLUDEPATH/
qdoc: Added breadcrumbs for most other pages.
Diffstat (limited to 'tools/qml/qml.pro')
| -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 } |