diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-10 22:14:47 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-10 22:14:47 (GMT) |
commit | 6d12a816ae6e2ed2d318d783b573f7cf8f0fee0a (patch) | |
tree | 0a5fd8ac1eac9efbbe2f953f27f0ee03a1a43b4c /src/plugins | |
parent | 38e1ed3b51d6aad46912eb548490d038e58203d9 (diff) | |
parent | 722d25d7a4fb0bc64d5bceae40019c7a8f3a9251 (diff) | |
download | Qt-6d12a816ae6e2ed2d318d783b573f7cf8f0fee0a.zip Qt-6d12a816ae6e2ed2d318d783b573f7cf8f0fee0a.tar.gz Qt-6d12a816ae6e2ed2d318d783b573f7cf8f0fee0a.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:
Use $${EPOCROOT} variable rather than absolute paths in .pro files
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/phonon/mmf/mmf.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro index ac11188..691fc80 100644 --- a/src/plugins/phonon/mmf/mmf.pro +++ b/src/plugins/phonon/mmf/mmf.pro @@ -18,7 +18,7 @@ symbian { # This is necessary because both epoc32/include and Phonon contain videoplayer.h. # By making /epoc32/include the first SYSTEMINCLUDE, we ensure that # '#include <videoplayer.h>' picks up the Symbian header, as intended. - PREPEND_INCLUDEPATH = /epoc32/include + PREPEND_INCLUDEPATH = $${EPOCROOT}epoc32/include PREPEND_INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty |