summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-11-174-29/+66
|\
| * No audio devices found for Ubuntu with QAudio classesKurt Korbatits2009-11-164-29/+66
| | | | | | | | | | | | | | Changed alsa implementation to present audio devices from alsa. Task-number:QTBUG-5723 Reviewed-by:Justin McPherson
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-11-124-7/+25
|\ \ | |/
| * Fix compilation of Phonon DS9 backend when Qt is built statically.Andrew den Exter2009-11-123-6/+7
| | | | | | | | | | | | | | | | | | qt_plugin_instance() isn't defined in a static build. Assign a pointer the shared mutex to static member variable in the backend constructor, rather than returning it from a static member function. Task-number: QTBUG-5207 Reviewed-by: Justin McPherson
| * Fix assert on windows when deleting phonon nodes from a running graph.Andrew den Exter2009-11-121-1/+18
| | | | | | | | | | | | | | | | If removing a filter from the direct show graph fails because it is running, stop the graph and try again. Task-number: QTBUG-5011 Reviewed-by: Justin McPherson
| * Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-111-0/+42
| | | | | | Reviewed-by: TrustMe
| * Phonon; Integrate changes to cmake files.Justin McPherson2009-11-114-20/+38
| | | | | | Reviewed-by: TrustMe
| * Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-111-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | id. This fix is similar to KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
| * Gstreamer: Added DVD supportJustin McPherson2009-11-111-15/+19
| | | | | | | | | | | | | | | | Intergrated KDE change 1040729 by nlecureuil This bug was already fixed in Qt phonon repo in exactly the same way, but KDE change is applyed to keep phonon sources in sync. Reviewed-by: Dmytro Poplavskiy
| * Gstreamer: Do not assume that the list index is the same as the device id.Justin McPherson2009-11-111-4/+7
| | | | | | | | | | | | | | Integrated KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
| * gstreamer: Set the glib app name only once and do it in the backend.Justin McPherson2009-11-112-1/+7
| | | | | | | | | | | | | | Integrated KDE change 1027567 by cguthrie. Glib issues a warning if this is called more than once so we ensure that's what we do. Reviewed-by: Dmytro Poplavskiy
| * Gstreamer: Detect more mimetypesJustin McPherson2009-11-111-2/+9
| | | | | | | | | | | | Integrated KDE change 1029491 by nlecureuil Reviewed-by: Dmytro Poplavskiy
| * reduce the speed of CD drive to 2X while playing CD audio to limit CDJustin McPherson2009-11-111-3/+15
| | | | | | | | | | | | | | drive noise Integrated KDE changes 1029492, 1030905 by nlecureuil Reviewed-by: Dmytro Poplavskiy
| * gstreamer: Do not call gst_deinit() but do free the device and effect ↵Justin McPherson2009-11-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | manager objects on backend destruction. Integrated KDE change 1027566 by cguthrie. Normally the backend is only destroyed once when the app exists, but calling gst_deinit() means that the whole gstreamer system becomes unrecoverable. This means that if you switch backends away from gstreamer and then back again it will not work. Gstreamer devs recommend that you do not call gst_deinit() at all except in test cases. Reviewed-by: Dmytro Poplavskiy
| * Remove rogue \refs from documentation.Justin McPherson2009-11-112-2/+2
| | | | | | Reviewed-By: TrustMe
| * Import change 924855 from phonon-svn.Justin McPherson2009-11-111-2/+6
| | | | | | | | | | | | | | r924855 | mkretz | 2009-02-12 05:49:12 +1000 (Thu, 12 Feb 2009) | 1 line forwardport: two more adaptor accesses where adaptor might be 0 Reviewed-by: Justin McPherson
| * Import change 932546 from phonon-svn.Justin McPherson2009-11-1191-91/+91
| | | | | | | | | | | | | | r932546 | thiago | 2009-02-27 07:33:54 +1000 (Fri, 27 Feb 2009) | 1 line Update copyrights: Trolltech ASA -> Nokia Corporation Reviewed-by: Justin McPherson
| * Import change 950964 from phonon-svn.Justin McPherson2009-11-111-2/+2
| | | | | | | | | | | | | | | | r950964 | dfaure | 2009-04-08 19:26:40 +1000 (Wed, 08 Apr 2009) | 2 lines fix compilation with -DQT_STRICT_ITERATORS Reviewed-by: Justin McPherson
| * Import change 953828 from phonon-svnJustin McPherson2009-11-111-1/+1
| | | | | | | | | | | | | | | | | | r953828 | tkrotoff | 2009-04-15 01:25:00 +1000 (Wed, 15 Apr 2009) | 1 line Fix qmath.h include: should be written <QtCore/qmath.h> instead of <qmath.h> in order to be consistent with the rest of the code that use <QtCore/...> Reviewed-by: Justin McPherson
* | Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-121-0/+42
| | | | | | | | Reviewed-by: TrustMe
* | Phonon; Integrate changes to cmake files.Justin McPherson2009-11-124-20/+38
| | | | | | | | Reviewed-by: TrustMe
* | Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-121-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | id. This fix is similar to KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
* | Gstreamer: Added DVD supportJustin McPherson2009-11-121-15/+19
| | | | | | | | | | | | | | | | | | Intergrated KDE change 1040729 by nlecureuil This bug was already fixed in Qt phonon repo in exactly the same way, but KDE change is applyed to keep phonon sources in sync. Reviewed-by: Dmytro Poplavskiy
* | Gstreamer: Do not assume that the list index is the same as the device id.Justin McPherson2009-11-121-4/+7
| | | | | | | | | | | | | | | | Integrated KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
* | gstreamer: Set the glib app name only once and do it in the backend.Justin McPherson2009-11-122-1/+7
| | | | | | | | | | | | | | | | Integrated KDE change 1027567 by cguthrie. Glib issues a warning if this is called more than once so we ensure that's what we do. Reviewed-by: Dmytro Poplavskiy
* | Gstreamer: Detect more mimetypesJustin McPherson2009-11-121-2/+9
| | | | | | | | | | | | Integrated KDE change 1029491 by nlecureuil Reviewed-by: Dmytro Poplavskiy
* | reduce the speed of CD drive to 2X while playing CD audio to limit CDJustin McPherson2009-11-121-3/+15
| | | | | | | | | | | | | | | | drive noise Integrated KDE changes 1029492, 1030905 by nlecureuil Reviewed-by: Dmytro Poplavskiy
* | gstreamer: Do not call gst_deinit() but do free the device and effect ↵Justin McPherson2009-11-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | manager objects on backend destruction. Integrated KDE change 1027566 by cguthrie. Normally the backend is only destroyed once when the app exists, but calling gst_deinit() means that the whole gstreamer system becomes unrecoverable. This means that if you switch backends away from gstreamer and then back again it will not work. Gstreamer devs recommend that you do not call gst_deinit() at all except in test cases. Reviewed-by: Dmytro Poplavskiy
* | Remove rogue \refs from documentation.Justin McPherson2009-11-122-2/+2
| | | | | | | | Reviewed-By: TrustMe
* | Import change 924855 from phonon-svn.Justin McPherson2009-11-121-2/+6
| | | | | | | | | | | | | | | | r924855 | mkretz | 2009-02-12 05:49:12 +1000 (Thu, 12 Feb 2009) | 1 line forwardport: two more adaptor accesses where adaptor might be 0 Reviewed-by: Justin McPherson
* | Import change 932546 from phonon-svn.Justin McPherson2009-11-1291-91/+91
| | | | | | | | | | | | | | | | r932546 | thiago | 2009-02-27 07:33:54 +1000 (Fri, 27 Feb 2009) | 1 line Update copyrights: Trolltech ASA -> Nokia Corporation Reviewed-by: Justin McPherson
* | Import change 950964 from phonon-svn.Justin McPherson2009-11-121-2/+2
| | | | | | | | | | | | | | | | r950964 | dfaure | 2009-04-08 19:26:40 +1000 (Wed, 08 Apr 2009) | 2 lines fix compilation with -DQT_STRICT_ITERATORS Reviewed-by: Justin McPherson
* | Import change 953828 from phonon-svnJustin McPherson2009-11-121-1/+1
| | | | | | | | | | | | | | | | | | r953828 | tkrotoff | 2009-04-15 01:25:00 +1000 (Wed, 15 Apr 2009) | 1 line Fix qmath.h include: should be written <QtCore/qmath.h> instead of <qmath.h> in order to be consistent with the rest of the code that use <QtCore/...> Reviewed-by: Justin McPherson
* | Doc: fix typoVolker Hilsheimer2009-11-111-1/+1
| | | | | | | | Fixes: QTBUG-5167
* | Doc: Link to the public bug tracker.Volker Hilsheimer2009-11-112-11/+24
| |
* | Changes file updatedaavit2009-11-111-0/+2
| |
* | doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-112-3/+10
| |
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Benjamin Poulain2009-11-1143-20848/+21472
|\ \
| * | Fixing warnings in QScopedPointer test caseJoão Abecasis2009-11-111-1/+2
| | |
| * | qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-114-25/+41
| | | | | | | | | | | | | | | | | | | | | | | | ...in the \qmlmethod and \qmlsignal commands, and the corresponding "attached" ones. Previously, the type was not allowed, but it really should be there, which means the \qmlmethod and \qmlsignal commands should be updated throughout.
| * | qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-112-2/+5
| | | | | | | | | | | | In the Method Documentation and Signal Documentation sections.
| * | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-117-88/+152
| | | | | | | | | | | | | | | | | | Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
| * | Def files frozen for 4.6.0 RCShane Kearns2009-11-1120-361/+21660
| | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| * | Switch on DEF filesShane Kearns2009-11-111-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEF files containing the frozen DLL exports are in use for Symbian OS builds, except developer builds (configured with -developer-build) The reason for this exception is that developer builds export additional private interfaces to allow autotests to inject or monitor the internal data of a class. These autotest exports are not part of the API or the binary interface, so they are excluded from DEF files. Task-number: QTBUG-4436 Reviewed-by: Jason Barron
| * | Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| * | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-116-9/+56
| |\ \
| | * | Pinchzoom example zooms more smoothDenis Dzyubenko2009-11-112-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remember the scale factor so it won't reset each time a new touch sequence starts. Reviewed-by: Bradley T. Hughes
| | * | Fixed opening files in the findfile example.Denis Dzyubenko2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QDesktopServices::openUrl expects a proper url, not just a filename. Reviewed-by: Jedrzej Nowacki
| | * | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1016-217/+805
| | |\ \
| | * \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-104-59/+163
| | |\ \ \
generated by cgit v0.12 at 2024-11-15 05:28:25 (GMT)