summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-112-3/+10
| |
* | 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-111-3/+11
|\ \
| * \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1015-199/+584
| |\ \
| * \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-102-42/+14
| |\ \ \
| * \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1046-228/+1087
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'origin/4.6' into 4.6-platformDenis Dzyubenko2009-11-0979-323/+585
| |\ \ \ \ \
| * | | | | | Add error handling for SetTimer() with the sentinel timer idBradley T. Hughes2009-11-091-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SetTimer() fails when trying to delay sendPostedEvents(), emit a warning and try to continue. Reviewed-by: mauricek
* | | | | | | Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-11177-1163/+2790
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Documentation: Adding comments to QHoverEvent classMorten Engvoldsen2009-11-101-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explaining the difference between hover events and enter/leave/move events Task-number: QT-1116 Reviewed-by: Bjørn Erik Nilsen
| * | | | | | exporting QGraphicsEffectSource is requiredDaniel Molkentin2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q3MainWindow and Q3TitleBar depend on it. Reviewed-By: dt Reviewed-By: Alessandro Portale
| * | | | | | Qt covers BC break in SymbianAlessandro Portale2009-11-101-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround: fntstore.h has an inlined function 'COpenFont* CBitmapFont::OpenFont()' that returns a private data member. The header will change between minor SDK versions, thus break BC. But Qt has to build on any SDK version and run on other versions of Symbian OS. Also Qt does not want to deliver that BC to Qt based apps. This hack performs the needed pointer arithmetic to get the right COpenFont* pointer, no matter if the 'Flexible Memory Model' is already supported or not. The author is not proud of this commit. Task-number: QT-2250 Reviewed-by: Iain Reviewed-by: Shane Kearns modified: src/gui/text/qfontdatabase_s60.cpp
| * | | | | | Removed unused public Api from QS60StyleAlessandro Portale2009-11-106-85/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style::setStyleProperty() and QS60Style::styleProperty() were intended as generic property setter/getters, but are not needed anymore. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp modified: src/gui/styles/qs60style.h modified: src/gui/styles/qs60style_p.h modified: src/gui/styles/qs60style_s60.cpp modified: src/gui/styles/qs60style_simulated.cpp modified: src/s60installs/eabi/QtGuiu.def
| * | | | | | Doc: remove graphics for effects that are no longer in scope.Volker Hilsheimer2009-11-101-1/+11
| | | | | | |
| * | | | | | Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-1010-74/+144
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| | * | | | | | Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-099-90/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is internal, so it should live in its private header. The class was introduced during the lifetime of 4.6 (not in 4.5), so the move is binary compatible. Task-number: QTBUG-5617 Reviewed-by: João Abecasis <joao@abecasis.name>
generated by cgit v0.12 at 2025-02-10 07:58:32 (GMT)