summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-143-12/+12
|\ | | | | | | | | | | | | | | | | 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."
| * Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-141-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-143-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-135-20/+31
|\ \
| * \ Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-131121-1225/+1241
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testlupdate.cpp
| | * Modifies the google chat example to use the DOM APIPierre Rossi2010-01-123-18/+29
| | | | | | | | | | | | | | | | | | Now that it's there, we might as well use it! Reviewed-by: Benjamin Poulain
| | * Added the 'framecapture' WebKit example to the default build.Andre Pedralho2010-01-111-1/+2
| | | | | | | | | | | | | | | | | | Merge-request: 2235 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Simon Hausmann
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-091-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Doc typos fixedJarek Kobus2010-01-081-1/+0
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
* | | | Doc: Resized the window and added a title.David Boddie2010-01-121-160/+161
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-117-18/+34
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-091119-1206/+1210
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ) ...
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-083-16/+16
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-084-2/+18
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Added UIDs and icons to some webkit examplesMiikka Heikkinen2010-01-074-2/+18
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Merge branch '4.6' of ../../4.6 into 4.6Justin McPherson2010-01-077-71/+86
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: examples/multimedia/audiodevices/audiodevices.cpp
| * | | Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-063-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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() to QAudioFormat.Kurt Korbatits2010-01-063-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added setChannelCount() and updated docs/examples/tests to use it instead of setChannels(). Reviewed-by:Justin McPherson
* | | | Doc: Added a missing example to the list of Graphics View examples.David Boddie2010-01-111-0/+1
| |_|/ |/| | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-071119-1140/+1140
|\ \ \
| * | | Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-062-13/+13
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4685 Reviewed-by: TrustMe
| * | | Update copyright year to 2010Jason McDonald2010-01-061119-1127/+1127
| | |/ | |/| | | | | | | Reviewed-by: Trust Me
* | | Doc: Made coding style changes to the Audio Input and Output examples.David Boddie2010-01-063-66/+70
|/ / | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-177-75/+90
|\ \ | |/ |/|
| * Doc: Modified the coding style of the Audio Devices example.David Boddie2009-12-154-69/+84
| | | | | | | | | | | | This commit will be a duplicate of the same change applied elsewhere. Reviewed-by: Kurt Korbatits
| * Change some examples of Webkit to create the mainwindow on the stackBenjamin Poulain2009-12-143-6/+6
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-12-142-1/+23
|\ \ | |/ |/| | | | | Conflicts: configure.exe
| * audioinput and audiooutput examples not using isFormatSupportedKurt Korbatits2009-12-072-1/+23
| | | | | | | | | | | | | | | | | | 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
* | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-091-2/+2
|\ \
| * \ Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-047-22/+25
| |\ \
| * \ \ Merge branch 'ooo-sequential' of ↵Jan-Arve Sæther2009-12-011-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/~fleury/qt/fleury-openbossa-clone into fleury-ooo-sequential Conflicts: tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
| | * | | QGAL (Test): Fix memory leaks in example and testsEduardo M. Fleury2009-11-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Stylesheets example: Fix warning about multiple &-mnemonics.Friedemann Kleint2009-12-041-1/+1
| |_|/ / |/| | | | | | | | | | | Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-294-13/+17
|\ \ \ \ | |/ / /
| * | | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-274-13/+17
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-263-11/+14
| | |\ \ | | | | | | | | | | | | | | | 4.6-staging2
| | | * | Made layout of the Softkeys example more compactMiikka Heikkinen2009-11-262-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | Fix for "saxbookmarks - file dialog starts in wrong directory (winscw)"Janne Anttila2009-11-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Fixes performance problem with scribble avoiding to redraw whole screen on ↵Daniil Ivanov2009-11-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | every MotionNotify event. Merge-request: 2210 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-251-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-257-26/+33
| | |\ \ \
| | * | | | StandardDialogs example: Fix warning about QKeySequence::mnemonic.Friedemann Kleint2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... with several '&'. Task-number: QTBUG-5667 Reviewed-by: Gabriel
* | | | | | create application object in qsdbg exampleKent Hansen2009-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 4.6, it's required that the Q(Core)Application object is constructed before QScriptEngine objects. Reviewed-by: TrustMe
* | | | | | rename .qs files to .jsKent Hansen2009-11-265-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Use a pixmap instead of an image in the tablet exampleBenjamin Poulain2009-11-252-19/+19
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Fix Broadcast receiver example.Jedrzej Nowacki2009-11-251-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Namespace build fails for webkit exampleRichard Moe Gustavsen2009-11-241-0/+2
| |/ / |/| | | | | | | | | | | | | | | | | Forward declarations outside namespace scope will fail in this case. Reviewed-by: brad
* | | A few tweaks to the frozen column examplePierre Rossi2009-11-233-2/+11
| | | | | | | | | | | | Reviewed-By: Thierry
* | | Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 ↵Simon Hausmann2009-11-233-24/+20
|\ \ \ | |/ / |/| | | | | into 4.6
generated by cgit v0.12 at 2024-07-20 04:57:41 (GMT)