diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-09-28 12:42:35 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-09-28 15:04:43 (GMT) |
| commit | d2bceb693aa26937f3def5e1b32fc4411d1b646a (patch) | |
| tree | afe0219a5f54380cf808c4a23fdb8c394978f8c3 /src/3rdparty/phonon | |
| parent | e0fb34194f9ce85f67f158011b4e706835a5667c (diff) | |
| download | Qt-d2bceb693aa26937f3def5e1b32fc4411d1b646a.zip Qt-d2bceb693aa26937f3def5e1b32fc4411d1b646a.tar.gz Qt-d2bceb693aa26937f3def5e1b32fc4411d1b646a.tar.bz2 | |
Fixed build errors due to header filename clashes between epoc32/include and Phonon.
Both epoc32/include and $QTDIR/include/Phonon contain a file called videoplayer.h. Both of these directories are listed as SYSTEMINCLUDE paths in the generated MMP file, with the Phonon path coming first. This means that '#include <videoplayer.h>' picks up the Phonon header rather than (as intended) the Symbian one.
A new qmake variable, PREPEND_INCLUDEPATH, is defined, allowing the .pro file to specify that /epoc32/include should be the first SYSTEMINCLUDE.
Diffstat (limited to 'src/3rdparty/phonon')
| -rw-r--r-- | src/3rdparty/phonon/mmf/mmf_videoplayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.h b/src/3rdparty/phonon/mmf/mmf_videoplayer.h index 2878d6a..a805135 100644 --- a/src/3rdparty/phonon/mmf/mmf_videoplayer.h +++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.h @@ -19,7 +19,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #ifndef PHONON_MMF_VIDEOPLAYER_H #define PHONON_MMF_VIDEOPLAYER_H -#include <include/videoplayer.h> +#include <videoplayer.h> // from epoc32/include #include "abstractmediaplayer.h" #include "videooutput.h" |