diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-22 13:03:11 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-22 13:03:11 (GMT) |
| commit | acc903853d5ac54d646d324b7386c998bc07d464 (patch) | |
| tree | f2ed3ccc611cebb70a4af7920a0fd0eec4ba5d73 /examples/phonon/phonon.pro | |
| parent | 56b4ada44ea5bfa1c4ee669aa00e9ae960965fe3 (diff) | |
| parent | bf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2 (diff) | |
| download | Qt-acc903853d5ac54d646d324b7386c998bc07d464.zip Qt-acc903853d5ac54d646d324b7386c998bc07d464.tar.gz Qt-acc903853d5ac54d646d324b7386c998bc07d464.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/qml-examples.qdoc
Diffstat (limited to 'examples/phonon/phonon.pro')
| -rw-r--r-- | examples/phonon/phonon.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/phonon/phonon.pro b/examples/phonon/phonon.pro index aa6ac13..c6a0bff 100644 --- a/examples/phonon/phonon.pro +++ b/examples/phonon/phonon.pro @@ -3,6 +3,9 @@ CONFIG += ordered SUBDIRS = qmusicplayer \ capabilities +# Disable capabilities example for symbian-gcce due to a bug in elf2e32. +symbian-gcce:SUBDIRS -= capabilities + # install target.path = $$[QT_INSTALL_EXAMPLES]/phonon sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS phonon.pro README |