diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-21 08:06:18 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-21 08:06:18 (GMT) |
| commit | a4d1be727573a7a87c523a2ef28074c77d16f165 (patch) | |
| tree | d4f8f218c41771ca17c7ab324390485af868fa8e /config.tests | |
| parent | cd2fd21578a80bc5ac121c0419ee00b1799d0a60 (diff) | |
| parent | 660ec910ef60513b511e2292255e53701dbb239b (diff) | |
| download | Qt-a4d1be727573a7a87c523a2ef28074c77d16f165.zip Qt-a4d1be727573a7a87c523a2ef28074c77d16f165.tar.gz Qt-a4d1be727573a7a87c523a2ef28074c77d16f165.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.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 = |