diff options
author | Frans Englich <frans.englich@nokia.com> | 2009-10-20 14:18:25 (GMT) |
---|---|---|
committer | Frans Englich <frans.englich@nokia.com> | 2009-10-20 14:18:25 (GMT) |
commit | 9bdc0a2d18bcc4938d79079e184a05acd5f43b22 (patch) | |
tree | b4cff4d92d9239cc30c2c9bbf040b2493af66b26 /src/s60installs/eabi/QtMultimediau.def | |
parent | 147c524e703d4727d03c5f2ea3f98ace25905b73 (diff) | |
parent | 76ef766a32cdcfd9cd64cf1d288c92a2b2040c15 (diff) | |
download | Qt-9bdc0a2d18bcc4938d79079e184a05acd5f43b22.zip Qt-9bdc0a2d18bcc4938d79079e184a05acd5f43b22.tar.gz Qt-9bdc0a2d18bcc4938d79079e184a05acd5f43b22.tar.bz2 |
Merge commit 'qt/4.6' into mmfphonon
Diffstat (limited to 'src/s60installs/eabi/QtMultimediau.def')
-rw-r--r-- | src/s60installs/eabi/QtMultimediau.def | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/s60installs/eabi/QtMultimediau.def b/src/s60installs/eabi/QtMultimediau.def index 787ad3a..30f921c 100644 --- a/src/s60installs/eabi/QtMultimediau.def +++ b/src/s60installs/eabi/QtMultimediau.def @@ -115,8 +115,8 @@ EXPORTS _ZN19QAbstractAudioInput6notifyEv @ 114 NONAME _ZN19QVideoSurfaceFormat11setPropertyEPKcRK8QVariant @ 115 NONAME _ZN19QVideoSurfaceFormat11setViewportERK5QRect @ 116 NONAME - _ZN19QVideoSurfaceFormat12setFrameRateERK5QPairIiiE @ 117 NONAME - _ZN19QVideoSurfaceFormat12setFrameRateEii @ 118 NONAME + _ZN19QVideoSurfaceFormat12setFrameRateERK5QPairIiiE @ 117 NONAME ABSENT + _ZN19QVideoSurfaceFormat12setFrameRateEii @ 118 NONAME ABSENT _ZN19QVideoSurfaceFormat12setFrameSizeERK5QSizeNS_12ViewportModeE @ 119 NONAME _ZN19QVideoSurfaceFormat12setFrameSizeEiiNS_12ViewportModeE @ 120 NONAME _ZN19QVideoSurfaceFormat16setYuvColorSpaceENS_13YuvColorSpaceE @ 121 NONAME @@ -275,4 +275,6 @@ EXPORTS _ZThn8_N18QAudioEnginePluginD0Ev @ 274 NONAME _ZThn8_N18QAudioEnginePluginD1Ev @ 275 NONAME _Zls6QDebugRK19QVideoSurfaceFormat @ 276 NONAME + _ZTV28QAudioEngineFactoryInterface @ 277 NONAME ABSENT + _ZN19QVideoSurfaceFormat12setFrameRateEf @ 278 NONAME |