diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-15 14:20:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-15 14:20:23 (GMT) |
| commit | ef93b78f38d7f35f42bc896ad23263668ac9f2e7 (patch) | |
| tree | 2c460390dfc10b0ae1f5f784d378a3f53ccd8d75 /examples | |
| parent | 45c31fee7deea7800a2ef86dad7d6966ee2ceafd (diff) | |
| parent | b3b332a50a6288164ca86d0691e9615f9c19abda (diff) | |
| download | Qt-ef93b78f38d7f35f42bc896ad23263668ac9f2e7.zip Qt-ef93b78f38d7f35f42bc896ad23263668ac9f2e7.tar.gz Qt-ef93b78f38d7f35f42bc896ad23263668ac9f2e7.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: (46 commits)
Fix the license info for bin/elf2e32_qtwrapper.pl.
Avoid panics in QDesktopWidget on Symbian emulator.
QS60Style: use placeholder texture when polishing widgets and palette
Regression: QS60Style: Theme background is incorrect
Remove changes from fix to QTBUG-17045 that were not related to the fix
Prevent null pointer crash when closing splitview
QS60Style slows down layout switch by updating widgets unnecessarily
Fix qgraphicstransform autotest for Symbian, where qreal is float.
Removed reference to nonexistant profile.
Disable capabilities example for symbian-gcce due to a bug in elf2e32
Readded a ';;' that was removed by mistake.
Fixed mkspec detection for Symbian.
Removed javascript-jit from default symbian-gcce build.
Corrected a mismerge in GCCE link parameters.
Fixed incorrect referral to an include file.
Fixed win32-msvc2008 build regression.
Made qmake strip trailing \ from libdirs.
Fixed GCCE libdir handling if the paths have spaces in them.
Added MinGW support for adding lib prefix and extension via profile.
Added support for various special compiler/linker flags on MinGW.
...
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 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 |