| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/corelib/io/io.pri
src/corelib/io/qfsfileengine.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtDeclarativeu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qapplication/test/test.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qdiriterator/qdiriterator.pro
tests/auto/qsound/qsound.pro
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Complement previous commit by aligning Qt itself to use .files
consistently for DEPLOYMENT as well as INSTALLS.
This excludes changes to webkit.
Task-number: QTBUG-3216
Reviewed-by: axis
|
|/
|
|
|
|
|
|
|
|
|
| |
Due to the change from default deployment in symbian from being hardcoded
in qmake to being in default_deployment.prf the .pro files needed to be
changed.
Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise
the default deployment lines are not added and the test won't install.
Reviewed-By: Miikka Heikkinen
|
|\
| |
| |
| |
| | |
Conflicts:
src/multimedia/audio/qaudioinput_win32_p.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was causing a crash on windows because the buffer and period sizes
were worked out to 0 with an invalid sample size and dividing one by the
other is division by 0.
Task-number: QTMOBILITY-438
Reviewed-by: Justin McPherson
|
|/ |
|
|
|
|
| |
Reviewed-by: Kurt Korbatits
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320.
Conflicts:
examples/multimedia/audioinput/audioinput.cpp
examples/multimedia/audiooutput/audiooutput.cpp
src/multimedia/audio/qaudio_mac.cpp
src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioformat.h
src/multimedia/audio/qaudioinput.cpp
src/multimedia/audio/qaudiooutput.cpp
tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
tests/auto/qaudioformat/tst_qaudioformat.cpp
tests/auto/qaudioinput/tst_qaudioinput.cpp
tests/auto/qaudiooutput/tst_qaudiooutput.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit f124538ef4840c3d24b4c7e9e7221adb52bdee2c.
Conflicts:
examples/multimedia/audioinput/audioinput.cpp
examples/multimedia/audiooutput/audiooutput.cpp
src/multimedia/audio/qaudio_mac.cpp
src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioformat.h
src/multimedia/audio/qaudioinput.cpp
src/multimedia/audio/qaudiooutput.cpp
tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
tests/auto/qaudioformat/tst_qaudioformat.cpp
tests/auto/qaudioinput/tst_qaudioinput.cpp
tests/auto/qaudiooutput/tst_qaudiooutput.cpp
|
|\
| |
| |
| |
| | |
Conflicts:
src/multimedia/audio/qaudioformat.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
-Added channelCount(), changed everything to use this instead
of channels() in QAudioFormat class.
-Added setSampleRate() and sampleRate(), changed everthing to use these
instead of setFrequency() and frequency() in QAudioFormat class.
-Added supportedSampleRates() and supportedChannelCounts(), changed
everything to use these instead of supportedFrequencies() and
supportedChannels() in QAudioDeviceInfo class.
Reviewed-by:Justin McPherson
|
| |
| |
| |
| |
| |
| |
| | |
Added setChannelCount() and updated docs/examples/tests to use it
instead of setChannels().
Reviewed-by:Justin McPherson
|
|/
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice*
start()
Reviewed-by:Justin McPherson
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() ->
QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void
start(QIODevice*), QIODevice*
start()
Reviewed-by:Justin McPherson
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice*
start()
Reviewed-by:Justin McPherson
|
|
|
|
|
|
| |
-Check to make sure clock() return is in microseconds.
Reviewed-by:Justin McPherson
|
|
|
|
|
|
|
| |
Due to lower performance the expected signal count was decreased for
this test.
Reviewed-by: Maurice
|
|
|
|
|
|
|
| |
- clock() should return valid value except in stop state, return 0.
- Added clock() function testing to unit tests.
Reviewed-by:Justin McPherson
|
|
|
|
|
|
| |
Added more checking in each step of the playback or recording tests.
Reviewed-by:Justin McPherson
|
|
|
|
|
|
| |
QAudioDeviceInfo.
Reviewed-by: Bill King
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
Handle platforms that don't have backends.
Reviewed-by: Bill King
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|