diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-05 14:05:00 (GMT) |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-05 14:05:00 (GMT) |
commit | c743e81790213db0c9a4abcee993fce0368b6367 (patch) | |
tree | 4eeaa5fd21f18981f8e31a3288da92d3e2084ead /config.tests | |
parent | d9f42e554c1da7aafad59881e1d143ff8672b833 (diff) | |
parent | a7bf1cfb1a75c35e837c01f4a5b0697fc8961148 (diff) | |
download | Qt-c743e81790213db0c9a4abcee993fce0368b6367.zip Qt-c743e81790213db0c9a4abcee993fce0368b6367.tar.gz Qt-c743e81790213db0c9a4abcee993fce0368b6367.tar.bz2 |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
src/gui/painting/qpdf.cpp
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/symbian/audio/audio.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.tests/symbian/audio/audio.pro b/config.tests/symbian/audio/audio.pro index abbde6e..b2a1986 100644 --- a/config.tests/symbian/audio/audio.pro +++ b/config.tests/symbian/audio/audio.pro @@ -3,5 +3,7 @@ SOURCES = audio.cpp INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/server INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/common +INCLUDEPATH += $${EPOCROOT}epoc32/include/platform LIBS += -lmmfdevsound +QT = |