diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 04:53:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 04:53:30 (GMT) |
| commit | 424fb9610473c15adfa5dd38606be032ebacd536 (patch) | |
| tree | 439fa00a2e9fe66cfb89bdfc3c0366d27440151e /tools | |
| parent | 26af4d54ea4f3a48d053038f34a00aa1119a585b (diff) | |
| parent | 65493e69454f8914d0ae1607e5a071ea07bb7017 (diff) | |
| download | Qt-424fb9610473c15adfa5dd38606be032ebacd536.zip Qt-424fb9610473c15adfa5dd38606be032ebacd536.tar.gz Qt-424fb9610473c15adfa5dd38606be032ebacd536.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
audiodevices example: no devices available
Add QFontMetrics benchmark.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7751143..abf81bd 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2535,8 +2535,11 @@ void Configure::generateOutputVars() qtConfig += "phonon-backend"; } - if (dictionary["MULTIMEDIA"] == "yes") + if (dictionary["MULTIMEDIA"] == "yes") { qtConfig += "multimedia"; + if (dictionary["AUDIO_BACKEND"] == "yes") + qtConfig += "audio-backend"; + } if (dictionary["WEBKIT"] == "yes") qtConfig += "webkit"; |