| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
ALSA can return a list of one empty item when no devices are available.
Task-number: QTBUG-12690
Reviewed-by: Andrew den Exter
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/page/FrameView.h
src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
src/3rdparty/webkit/WebCore/platform/ScrollView.h
src/corelib/plugin/quuid.cpp
src/gui/dialogs/qfontdialog.cpp
src/multimedia/audio/qaudiodevicefactory.cpp
src/opengl/qgl.cpp
src/openvg/qpaintengine_vg.cpp
tests/auto/qxmlquery/tst_qxmlquery.cpp
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-11900
Reviewed-by: Andrew den Exter
|
| |
| |
| |
| |
| |
| |
| | |
pointer increment
Task-number:QTBUG-11883
Reviewed-by:Andrew den Exter
|
| |
| |
| |
| |
| | |
Task-number:QTBUG-11755
Reviewed-by:Derick Hawcroft
|
| |
| |
| |
| | |
Reviewed-by:TrustMe
|
| |
| |
| |
| | |
Reviewed-by:TrustMe
|
| |
| |
| |
| |
| |
| | |
WAVE_FORMAT_EXTENSIBLE not in v6.0 ms SDK only in v6.1's
Reviewed-by:TrustMe
|
| |
| |
| |
| | |
Reviewed-by:Andrew den Exter
|
| |
| |
| |
| |
| | |
Task-number:QTBUG-11586
Reviewed-by:Derick Hawcroft
|
| |\ |
|
| | |
| | |
| | |
| | |
| | | |
Task-number:QTBUG-11586
Reviewed-by:Andrew den Exter
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-10009
Reviewed-by:Dmytro Poplavskiy
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
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.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
|
| |
| |
| |
| |
| |
| |
| |
| | |
- 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
|
| |
| |
| |
| |
| | |
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: trustme
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
|/ / / |
|
| | | |
|
|\ \ \
| |/ / |
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Work done jointly by Gareth and me. Yields no qdoc errors.
Task-number: QTBUG-9342
Task-number: QTBUG-9120
Reviewed-by: Gareth Stockwell
Reviewed-by: David Boddie
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/multimedia/audio/qaudioinput_win32_p.h
|
| |
| |
| |
| |
| |
| |
| |
| | |
Increased default buffer size and period size for windows.
11025monoS16LE was choppy, needed bigger periods.
Task-number:QTBUG-9101
Reviewed-by:Derick Hawcroft
|
| |
| |
| |
| |
| |
| |
| | |
record from different soundcards
Task-number:QTBUG-9221
Reviewed-by:Andrew den Exter
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QtMultimedia backend for Windows
-Added 8000 as long as another frequency is available.
-options available changed from hard-coded to detected options.
Task-number:QTBUG-9100
Reviewed-by:Derick Hawcroft
|
| |
| |
| |
| |
| |
| |
| |
| | |
Removed state change from close() function, should be set by caller
depending on context.
Task-number:QTBUG-9357
Reviewed-by:Dmytro Poplavskiy
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (47 commits)
QScript: More missing APIShim
QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines
Work-around Symbian 10.1's broken egl.h
Add some #warnings to debug Symbian EGL build failure
Don't detect EGLImage presence by testing function pointers
Implement proper QStaticText support in QPaintBuffer
Make QStaticText layout lazy
Change QStaticText::setMaximumSize() to setTextWidth()
Respect QPainter::pen() in QPainter::drawStaticText()
QVarLenghtArray: add some API to be consistant to QVector
Don't try to resolve EGLImage function pointers if they are defined
Change ORs to ANDs when checking EGLImage extension defines
Protect EGLImage function definitions in #ifdef
Fix a bug in greek shaping causing infinite loops
Define QT_NO_EGL in configure.exe
improve mingw 64 bit support
Fix build on Windows
Round instead of ceil font metrics when ForceIntegerMetrics is enabled
cetest: remove source file duplicates from cetest.pro
Remove EGLImage create/destroy resolving from VG pixmap data
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tools/qdoc3/generator.cpp
tools/qdoc3/node.cpp
|
| | | | |
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits)
Make destructor virtual.
Optimized QLocale to access system locale on demand.
Remove unwanted code in f8d5f2594a9b268b9eeecf95b24b23fc940c71ce
Compile fix on keypad-navigation systems
Force qt-zlib to be used for host system when cross compiling.
qmake: fix to create proper install target in Makefile at first run
compile fix for Windows
Fixed focus handling when Qt is embedded into Cocoa app.
Do not beep on Mac when pressing some keys.
Do not deliver the same key event multiple times in Cocoa.
Implement Idle-priority threads for Linux.
Improved qt_x11_wait_for_window_manager
Doc: document QElapsedTimer
Added missing "const" for mac.
qdoc3: Fixed some ifdef typos and removed some whitespace.
Manual test for QTBUG-8933.
Cocoa: minisplitter has only 1px wide grab area
"Strictly" Fullscreen Application in Mac OS
Bugfix the Symbian implementation
Add QDateTime::currentDateTimeUtc and QDateTime::currentMsecsSinceEpoch
...
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/|
| | |
| | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|