| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
| |
Reviewed-by: Peter Hartmann
|
|
|
|
|
|
|
|
| |
If you use refs, then you can't use this operator as the first
argument, since qDebug() returns QDebug by-value (an rvalue
temporary). That cannot be bound to a non-const ref.
Task-number: QTBUG-7593
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
Revert "Frequency to SampleRate and channels to channelCount." missed
Revert "Frequency to SampleRate and channels to channelCount."
Revert "Added setChannelCount() to QAudioFormat."
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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:
tests/auto/linguist/lupdate/testlupdate.cpp
|
| | |
| | |
| | |
| | |
| | |
| | | |
Now that it's there, we might as well use it!
Reviewed-by: Benjamin Poulain
|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2235
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Reviewed-by: Simon Hausmann
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Doc typos fixed
Translations: Update German for 4.6.1
fix test under windows
don't complain about unresolved base when the reference is absolute
make the lupdate tests more verbose in case of failure
don't use qmake for test setup
move equivalent of output_ts test to good/
look for the .result file in the dir where the output is expected to go
fix sametext and number heuristics
fix number heuristics, part 1
no point in specifying -ts when a .pro file is specified
clean up the lupdatecmd files
tidy up the test .pro files
remove dead code
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: David Boddie <dboddie@trolltech.com>
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
|\ \ \ \
| | |_|/
| |/| | |
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
src/multimedia/audio/qaudioformat.cpp
|
| |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable building with MSVC2008
Added mention of Symbian binary packages to INSTALL file
Fix for QTBUG-5870 QGraphicsProxyWidget does not show children on
Deploy sqlite3.sis instead of sqlite3.dll in Symbian
Separated "make run" and "make runonphone" targets
Added UIDs and icons to some webkit examples
Implemented node disconnection in Phonon MMF backend
Removed dead code from Phonon MMF backend
Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.
Implemented support for playlist handling in Phonon MMF backend
Mediaplayer: enqueue all entries from .ram file before starting playback
Changed call sequence of seeking in Phonon MMF backend, for streaming
Implemented buffer status notifications in Phonon MMF backend
Added support for streaming playback to Phonon MMF backend
Phonon MMF: leaves during object construction throw exceptions
Removed stale TODO comments from Phonon MMF backend
Symbian: More i18n strings work.
Fixed bug which caused Phonon backend error messages to be suppressed
Added error strings to Phonon MMF backend
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
examples/multimedia/audiodevices/audiodevices.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
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-4685
Reviewed-by: TrustMe
|
| | |/
| |/|
| | |
| | | |
Reviewed-by: Trust Me
|
|/ /
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
|/| |
|
| |
| |
| |
| |
| |
| | |
This commit will be a duplicate of the same change applied elsewhere.
Reviewed-by: Kurt Korbatits
|
| | |
|
|\ \
| |/
|/|
| |
| | |
Conflicts:
configure.exe
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
function.
The examples failed to easy, added check to test and get if required
a format to use from the backend. Increases the chance of examples
working on various platforms like n900.
Reviewed-by:Justin McPherson
|
|\ \ |
|
| |\ \ |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
git://gitorious.org/~fleury/qt/fleury-openbossa-clone into fleury-ooo-sequential
Conflicts:
tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Some tests and the example were leaking memory what made it
harder to investigate leaks on the layout itself.
Those were simple errors like not deleting the layout at the
end of the test and were corrected.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| |_|/ /
|/| | |
| | | |
| | | | |
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
|\ \ \ \
| |/ / / |
|
| |\ \ \
| | |/ /
| |/| | |
|
| | |\ \
| | | | |
| | | | |
| | | | | |
4.6-staging2
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Softkeys example didn't fit on the screen in landscape mode due to
the widget minimum size enforcement done by Qt. Changed the layout
of the example from QVBoxLayout to QGridlayout to make better use of
the available space. Also shortened button texts.
Task-number: QTBUG-6126
Reviewed-by: Janne Anttila
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QCoreApplication::applicationFilePath() in emulator returns path to
Z drive. Use QDesktopServices instead which always returns the writable
drive.
Task-number: QTBUG-6117
Reviewed-by: Miikka Heikkinen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
every MotionNotify event.
Merge-request: 2210
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|\ \ \ \ \
| |/ / / / |
|
| |\ \ \ \
| | |/ / / |
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
... with several '&'.
Task-number: QTBUG-5667
Reviewed-by: Gabriel
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Since 4.6, it's required that the Q(Core)Application object is
constructed before QScriptEngine objects.
Reviewed-by: TrustMe
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QtScript _is_ JavaScript, there's no need to use a custom extension.
Most of the other examples were already using .js, but there were
two files that still had the .qs extension.
Agreed with Simon.
Reviewed-by: TrustMe
|
|/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The transformations QImage->QPixmap are killing the performance of the
tablet example. This is noticeable because of the number of events sent
by the tablet (painting MUST be fast in tabletEvent()).
Reviewed-by: David Boddie
|
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The broadcast receiver should share the port number. In most cases users
won't run the example on a network, but only on one machine. In the case
it simply should work too.
According to our documentation the fix is platform specific, it will
work only on Linux.
Reviewed-by: Peter Hartmann
|