summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-10 01:21:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-10 01:21:03 (GMT)
commit012b28ca212eb4faa0b97f3bf1e3cd84e86de015 (patch)
tree0bb40437acfd80d2e18ac11a0d0dcc06f913df89
parent75dc699c18ec8c665bb92685da38fbc2917f83e6 (diff)
parente48f03a052eaa5c175b373091a65238fa7755ed4 (diff)
downloadQt-012b28ca212eb4faa0b97f3bf1e3cd84e86de015.zip
Qt-012b28ca212eb4faa0b97f3bf1e3cd84e86de015.tar.gz
Qt-012b28ca212eb4faa0b97f3bf1e3cd84e86de015.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed wrong include path in multimedia.
-rw-r--r--src/multimedia/audio/audio.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri
index ae28a26..7b2f9ad 100644
--- a/src/multimedia/audio/audio.pri
+++ b/src/multimedia/audio/audio.pri
@@ -42,8 +42,8 @@ mac {
wince*:LIBS += -lcoredll
} else:symbian {
- INCLUDEPATH += /epoc32/include/mmf/common
- INCLUDEPATH += /epoc32/include/mmf/server
+ INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/common
+ INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/server
HEADERS += $$PWD/qaudio_symbian_p.h \
$$PWD/qaudiodeviceinfo_symbian_p.h \