| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/phonon/mmf/mmf.pro
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-8878
Reviewed-by:Dmytro Poplavskiy
|
| | |
| |
| |
| | |
Reviewed-by:Dmytro Poplavskiy
|
| | |
| |
| |
| | |
Reviewed-by:Dmytro Poplavskiy
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This resulted in the the video widget example not being able to play
some gif files.
Task-number: MOBILITY-1137 MOBILITY-1138
Reviewed-by: Justin McPherson
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
src/3rdparty/* is left untouched and not merged from 4.6. The corresponding
changes in Harfbuzz and WebKit are already in the 4.6 staging areas.
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc
tests/auto/qtextlayout/tst_qtextlayout.cpp
tests/auto/qwidgetaction/tst_qwidgetaction.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
QAbstractVideoBufferPrivate was intended to have virtual desctructor,
otherwise subclasses are not deleted properly.
Reviewed-by: Andrew den Exter
|
| |\ \ \
| |/ /
| | /
| |/
|/|
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-10009
Reviewed-by:Dmytro Poplavskiy
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
With the removal of QMediaServices, the multimedia sources were moved up
one level. Therefore they don't need a special case location for the def
files anymore, as the standard rule of ../s60installs used for Qt
libraries is sufficient.
Reviewed-by: Trust Me
|
| |\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
|
| | |
| |
| |
| |
| | |
Task-number:QTBUG-10760
Reviewed-by:Justin McPherson
|
| | |
| |
| |
| |
| | |
Task-number:QTBUG-10759
Reviewed-by:Justin McPherson
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
removed test file, part of mediaservice removal.
Rebuild configure.exe
Rebuild configure following the removal of media services.
More mediaservices removal work.
Removed mediaservices.
|
| | | | |
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| | |\ \ |
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Return correct formats supported lists from Symbian audio backend
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by:Gareth Stockwell
|
| | | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
Docs stated that the bufferSize was a value in milliseconds.
Corrected this to bytes.
Reviewed-by: trustme
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* QAudioDeviceInfoInternal functions now call CMMFDevSound::InitializeL()
The root cause of QTBUG-10205 was that CMMFDevSound::IntitializeL()
was not called before CMMFDevSound::Capabilities(), resulting in
incorrect values being returned by QAudioDeviceInfo 'supported format'
functions. Resolving this was not straightforward because, while
QAudioDeviceInfo is an entirely synchronous API,
CMMFDevSound::InitializeL() is an asynchronous function. The changes
therefore include a while(QApplication::instance()->processEvents(...))
loop, which is not a particularly elegant solution.
* Encapsulated all interaction with CMMFDevSound API in DevSoundWrapper
class
Because the original bug fix required QAudioDeviceInfoInternal to call
CMMFDevSound::InitializeL(), MDevSoundObserver callback functions had
to be implemented in QAudioDeviceInfoInternal. Rather than pollute
QAudioDeviceInfoInternal, a new class, DevSoundWrapper, was created
which encapsulates all interaction with CMMFDevSound, and therefore
implements MDevSoundObserver. QAudioInputPrivate and
QAudioOutputPrivate now call CMMFDevSound via DevSoundWrapper, with
only the required MDevSoundObserver callbacks forwarded on via signals.
After fixing this bug, running the auto test suites exposed a number
of regressions which had been introduced by the necessary refactoring
described above; this commit therefore also includes fixes for the
following:
* No stateChanged() signal emitted during DevSound initialization
Previously, QAudioInput / QAudioOutput would emit a state change from
StoppedState to IdleState or ActiveState, as soon as start() was called.
In the case where the requested format is subsequently found to be
unsupported, in addition to the error() value being set to OpenError,
a second state change would be emitted, back to StoppedState. This is
not the behaviour exhibited by the other platforms' backends,
and therefore caused an auto test failure. Now, the backend only
transitions to IdleState / ActiveState on successful initialization.
* Stop emitting notify() signal when notifyInterval is set to zero
* Call CMMFDevSound::RecordInitL() from QAudioInput::resume() if no
buffer is currently held
This is necessary in order to restart the data flow.
* Call CMMFDevSound::BufferFilled() from QAudioOutput::resume() in push
mode
The auto test does not resume pushing data to QAudioOutput until
'bytesFree() >= periodSize()' becomes true. Because, for the Symbian
backend, periodSize() == bufferSize(), this condition is only met when a
new buffer is provided by DevSound via BufferToBeFilled().
Task-number: QTBUG-10205
|
| | |/
|/| |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix project file generation for MSVC 2010
Fix wrong translation and clip for the raster paint-engine on Mac
Return the correct library name in qt_gl_library_name for GLES*
qmake: remove useless evaluation of variables from VS project generators
Fix QT_NO_LIBRARY
Documentation for the Elastic Nodes example.
qmake: fix duplicate linker options in VS project files
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
qmake: fix duplicate compiler options in VS project files
Documentation for the Drag and Drop Robot example.
Fix crash in styles example when running with opengl graphicssystem
Fixed the sizehint for cols/rows in qtableview
QUrl: parsing of host name with an undercore.
Null pointer check
Revert "Try to use multisampled opengl graphicssystem on all platforms"
A small mistake when comparing the flag.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix project file generation for MSVC 2010
Fix wrong translation and clip for the raster paint-engine on Mac
Return the correct library name in qt_gl_library_name for GLES*
qmake: remove useless evaluation of variables from VS project generators
Fix QT_NO_LIBRARY
Documentation for the Elastic Nodes example.
qmake: fix duplicate linker options in VS project files
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
qmake: fix duplicate compiler options in VS project files
Documentation for the Drag and Drop Robot example.
Fix crash in styles example when running with opengl graphicssystem
Fixed the sizehint for cols/rows in qtableview
QUrl: parsing of host name with an undercore.
Null pointer check
Revert "Try to use multisampled opengl graphicssystem on all platforms"
A small mistake when comparing the flag.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Some class uses QFactoryLoader without checking if QT_NO_LIBRARY is not
defined. Remove QT_NO_SETTINGS used with QT_NO_LIBRARY for
QFactoryLoader because LIBRARY depends on SETTINGS.
Merge-request: 578
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (105 commits)
Testlib XML flush: use benchmarkMetricName (identifier) overall instead of benchmarkMetricUnit (human text)
Update the testlib XML baselines with the unit names from QTestLib
Renaming a few unexported, private symbols
tst_selftest: parse benchlib results in XML format too
tst_selftests: replace a line number with __LINE__ in XML too
Removed fullscreen responsiveness of softkeys
tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt version.
fix crash in QXmlStreamReader
Fixed a QFontEngine leak for QFont objects used in threads.
The cmd line arguments have not been delegated properly.
Apply Rhys's fix to qpaintengine_vg.cpp to make it compile
Fixed QGLWidget::grabFrameBuffer() to honor the 'withAlpha' value.
Adjusted layout of audiodevice example to use scrollbar.
win32 backend for low-level audio fixes
QXmlSchema internals: fix crash with anonymous types
QNAM HTTP: Fix invoking a method when being destructed right now (2)
QNAM: Use a reference in appendDownstreamData
QNAM HTTP: Divide QNetworkReplyImplPrivate::appendDownstreamData
QNAM HTTP: Avoid one copy
Re-apply change 5107946e97cbc480a9329565c29b7384c8ba0860 by Iain
...
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
All EGL-related changes from 4.6 were discarded.
Conflicts:
src/gui/egl/egl.pri
src/gui/egl/qegl.cpp
src/gui/egl/qegl_p.h
src/gui/egl/qegl_stub.cpp
src/gui/egl/qeglproperties_p.h
src/gui/egl/qeglproperties_stub.cpp
src/gui/gui.pro
src/multimedia/multimedia/audio/qaudioinput_win32_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- fix deadlock with QAudioInput (win32) backend
- changed win32 backend to use QMutex lock
- setNotifyInterval(0) to disable notify() signal
Reviewed-by:Derick Hawcroft
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by:Derick Hawcroft
|
| | |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (73 commits)
Apply Rhys's fix to qpaintengine_vg.cpp to make it compile
Attempt again at fixing the OpenVG paint engine build
Revert "Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp"
Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp
Fixing the wrong QUrl usage
When on Symbian use smaller files.
correctly position glyphs for complex languages
Removed inneccessary QGlyphLayout::offsets initialization.
Fix mirrored characters for RTL text in Symbian
QNAM: Add a code comment related to the cache
tst_QSystemSemaphore::processes fixed for WinCE
tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
tst_qsharedmemory: fix deployment of lackey.exe for WinCE
fix compilation of tst_sharedmemory on Windows CE
QtScript: regression with instanceof operator for QMetaObject wrappers
examples/widgets/stylesheet fix mainwindow.ui
QStyleSheetStyle: fix memory leak on base style change
QNAM HTTP: Fixed a bug when getting empty files with pipelining
Fix window transparency on Symbian.
...
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (71 commits)
Revert "Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp"
Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp
Fixing the wrong QUrl usage
When on Symbian use smaller files.
correctly position glyphs for complex languages
Removed inneccessary QGlyphLayout::offsets initialization.
Fix mirrored characters for RTL text in Symbian
QNAM: Add a code comment related to the cache
tst_QSystemSemaphore::processes fixed for WinCE
tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
tst_qsharedmemory: fix deployment of lackey.exe for WinCE
fix compilation of tst_sharedmemory on Windows CE
QtScript: regression with instanceof operator for QMetaObject wrappers
examples/widgets/stylesheet fix mainwindow.ui
QStyleSheetStyle: fix memory leak on base style change
QNAM HTTP: Fixed a bug when getting empty files with pipelining
Fix window transparency on Symbian.
Tweak the 'normalGeometry' of the widget before setting it.
Use QDesktopWidget as a status pane observer on Symbian.
...
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (71 commits)
Revert "Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp"
Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp
Fixing the wrong QUrl usage
When on Symbian use smaller files.
correctly position glyphs for complex languages
Removed inneccessary QGlyphLayout::offsets initialization.
Fix mirrored characters for RTL text in Symbian
QNAM: Add a code comment related to the cache
tst_QSystemSemaphore::processes fixed for WinCE
tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
tst_qsharedmemory: fix deployment of lackey.exe for WinCE
fix compilation of tst_sharedmemory on Windows CE
QtScript: regression with instanceof operator for QMetaObject wrappers
examples/widgets/stylesheet fix mainwindow.ui
QStyleSheetStyle: fix memory leak on base style change
QNAM HTTP: Fixed a bug when getting empty files with pipelining
Fix window transparency on Symbian.
Tweak the 'normalGeometry' of the widget before setting it.
Use QDesktopWidget as a status pane observer on Symbian.
...
|
| | | | | |\ \
| | | | | |/
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/openvg/qpaintengine_vg.cpp
src/script/bridge/qscriptqobject_p.h
tests/auto/bic/tst_bic.cpp
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number:QTBUG-9766
Reviewed-by:Derick Hawcroft
|
| | | | | | |\
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Bug in QAudioOutput: Invalid use of "waveOutUnprepareHeader"
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fixed freeBlocks func in both input and output
Task-number:QTBUG-9875
Reviewed-by:Andrew den Exter
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by:Derick Hawcroft
|
| |\ \ \ \ \ \ \
| |/ / / / / / |
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into 4.7
|
| | | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | | |
Reviewed-by:Dmytro Poplavskiy
|
| | |/ / / / /
|/| | | | |
| | | | | |
| | | | | | |
Reviewed-by:Derick Hawcroft
|
| |/ / / / /
| | | | |
| | | | |
| | | | | |
Reviewed-by:Andrew den Exter
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits)
Remove trace code from directshowaudioendpointcontrol.h.
New configure.exe binary
Add support for MSBuild, which is the project format for MSVC 2010
Only add qvideowidget test once.
Multimedia causes build failure when Qt is configured with -embedded
Player demo: load not only local files but playlists and urls passed as
Gstreamer media backend: preserve playback rate after seeks and media
QT7 mediaservice; fix leaking strings.
Fixed Qt build with mediaservices disabled.
Multimedia tests; fix for missing dependency
Disabled QMediaPlayer states debug output.
Fixed typo in QMediaPlayer::play() error reporting
Fixed QVideoWidget test, waiting for video surface painted.
Tests; Fix media tests, make sure they are using mediaservies.
Fix warning about illegal empty declaration.
Three fixes from Shane after QtMultimedia was split into two dlls.
Fix compile errors in Direct Show media service.
Add EXPORT defines for QtMediaServices library.
Fixed configure check for gstreamer.
WebKit; build with change to mediaservices.
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
-qconfig minimal
Task-number:QTBUG-9960
Reviewed-by:Dmytro Poplavskiy
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It was enabled accidentally.
Reviewed-by: trustme
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Parameters to invokeMethod were omitted,
so error was not reported.
Reviewed-by: Justin McPherson
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Q_PRIVATE_SLOT declarations don't require a semi-colon.
Reviewed-by: Justin McPherson
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Three fixes from Shane after QtMultimedia was split into two dlls.
Fix compile errors in Direct Show media service.
Add EXPORT defines for QtMediaServices library.
Fixed configure check for gstreamer.
WebKit; build with change to mediaservices.
QtMediaservices -> QtMediaServices.
configure; Fixes for changes to use mediaservices.
Fixed compile errors in pulseaudio backend for soundeffect
Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d
Fixed compile errors with gstreamer plugin
Create Mediaservices lib, separate from Multimedia.
Gstreamer media backend: seek to media start on end of stream.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix1: QtMultimedia to get .def files from the correct location
multimedia was split into 2 subdirectories, which means the general
purpose rule in qbase.pri no longer works.
Task-number: QTBUG-9983
Reviewed-by: Miikka Heikkinen
Fix2: Fix QtMultimedia .def files
As a result of the split of multimedia into two DLLs, made the following
changes:
1. Revert QtMultimediau.def to v4.6.2 (compatibility baseline)
2. Freeze QtMultimedia and QtMediaServices
This is compatible with 4.6.2, but not compatible with any previous 4.7
build.
Task-number: QTBUG-9983
Fix3: Add QtMediaServices.dll to Qt.sis
The new dll will now be installed by the symbian sis package.
Task-number: QTBUG-9983
Reviewed-by: Miikka Heikkinen
|
