diff options
| author | axis <qt-info@nokia.com> | 2011-03-14 11:40:58 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-03-14 11:40:58 +0100 |
| commit | d8aa0f54f8e6f5d2a95965203b7f60c11297dacf (patch) | |
| tree | 27421db20ab68dff072f0d9a7735742d20855993 /examples | |
| parent | 8f59ff17926e246ff732ce40890a3a7625b8e826 (diff) | |
| parent | d45c67d01ce28f4fb85eace1116ca751a8f02827 (diff) | |
| download | qt4-tools-d8aa0f54f8e6f5d2a95965203b7f60c11297dacf.tar.gz | |
Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'examples')
| -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 aa6ac139e2..c6a0bffe99 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 |