summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Phonon::VolumeSlider: Fixed the isMuteVisiblefunctionThierry Bastian2009-06-171-1/+1
| | | | | | | | | The problem is that it was relying on button->isVisible whereas it should rely on isHidden. isVisible returns false initially when the whole widget is not yet shown. I also added an autotest for it. Task-number: 256331
* Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * Fix compile error on TigerRichard Moe Gustavsen2009-06-101-1/+2
| | | | | | | | | | | | the "for-in" syntax is only available on 10.5+ Reviewed-by: MortenS
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-086-64/+294
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * Mac: play music from CD does not work in PhononRichard Moe Gustavsen2009-06-086-83/+313
| | | | | | | | | | | | ...because it was never implemented. This patch does that. Task-number: 255377
* | Merge branch '4.5'Denis Dzyubenko2009-06-022-0/+3
|\ \ | |/
| * Fixed aspect ratio on WindowsThierry Bastian2009-06-022-0/+3
| | | | | | | | | | | | - When changing the aspect ratio, the video wouldn't update. - The VMR9 can in some cases try to manage the aspect ratio itself and then fights our system. This is now disabled.
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-1/+2
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * Fix a crash in Phonon::EffectWidgetJens Bache-Wiig2009-05-261-1/+2
| | | | | | | | | | | | | | | | | | | | When creating a UI based on double types we only assigned the control pointer in certain cases. This would crash because the tooltip did not check for the pointer, but the real issue was that we didnt assign the control in the first place. Task-number: 249710 Reviewed-by: Richard Moe Gustavsen
* | Ensure that the export symbols are correct. Patch supplied by Saleem/Dallas ↵Frans Englich2009-05-191-1/+5
| | | | | | | | | | | | | | team. Reviewed-By: Thiago Reviewed-By: jbache
* | Merge branch '4.5'Thiago Macieira2009-05-111-0/+5
|\ \ | |/
| * Make sure syncqt creates the Phonon/Global file.Thiago Macieira2009-05-111-0/+5
| | | | | | | | | | The standard Phonon package has this file and it points to phononnamespace.h
* | Merge branch '4.5'Rhys Weatherley2009-04-211-18/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Fixed a flicker when switching current source in Phonon::MediaObjectThierry Bastian2009-04-211-18/+9
| | | | | | | | Task-number: 251776
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-013-7/+11
|\ \ | |/ | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| * Get the qt7 phonon plugin to minimally compile on 10.6Norwegian Rock Cat2009-03-313-7/+11
| | | | | | | | | | | | | | | | | | | | We need to protect some overridden type and that is done in qmacdefines_mac.h, so just include that. To top this off, a function has changed that was introduced in 10.5. In order to use it properly, we would need to do lots of version checking and shuffling between types and it seems like more trouble that it's worth at the moment. We may have to do that in the future, but we'll deal with that then.
| * Long live Qt 4.5!Lars Knoll2009-03-23305-0/+48849
|
* Long live Qt!Lars Knoll2009-03-23305-0/+49051