summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation with qtbase master.HEADmasterDavid Faure2012-10-021-0/+2
| | | | | | | Both qMemCopy and QAbstractItemModel::reset have been deprecated. Change-Id: I222c807b344eec7ae292b48775baf51da9b650a8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move QIcon reference from QtWidgets to QtGui.ybot2012-05-204-4/+4
| | | | | Change-Id: I3e0de1442ee22a57dff2d7e2468e3c650c998ffc Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix warning about deprecated QAbstractItemModel::reset().Friedemann Kleint2012-04-272-1/+4
| | | | | Change-Id: I76fb3cdf072c4947d16b9fc35a71e56223a286c9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Adapt phonon to change in QMetaObjectOlivier Goffart2012-04-251-11/+11
| | | | | | | | | | Changes If0b8f586cbaf633eed10045adee3ba3366826c86 in qtbase. (Note that this change is optional since static memory is already initialized to 0) Change-Id: I403da65a01d12c3f4d7c707ffc3e13f6d5a65121 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Port ObjectDescriptionModel meta-objects to revision 7Kent Hansen2012-04-171-23/+70
| | | | | | | | There appear to be no autotests for the description model classes, but this is a best effort to port them to the new revision. Change-Id: I90a789aa1a3a9d8866550b72784451e9f93d509d Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Compile after Qt5 meta-object changesKent Hansen2012-04-171-5/+5
| | | | | | | | | | | | In Qt5 the meta-object stringdata is of type const QByteArrayData *. This commit keeps Phonon compiling while the custom meta-objects are ported over to the latest meta-object revision (7). Support for older revisions (<= 6) will be removed in Qt5. Change-Id: I50a79f6d1adc56f043da614faee9c99f640cfd72 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Fixed compile for QFSFileEngine removal.Rohan McGovern2012-02-221-3/+1
| | | | | Change-Id: If81975732f11385a103d77a86a28e4185d289fd4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Use QBasicAtomic*::load() and store() instead of implicit castingBradley T. Hughes2011-10-101-4/+4
| | | | | | | | | These casts will be unavailable in the near future Change-Id: I683ae7bf72741f79902945083bf9602ff3655b15 Reviewed-on: http://codereview.qt-project.org/6232 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* fixed wrong includes after refactoringMartin Zielinski2011-09-1916-30/+30
| | | | | | | | | changed QtGui/XXX to QtWidgets/XXX Change-Id: I98c326ed5232c96c184c24241220c9f4bf36b968 Reviewed-on: http://codereview.qt-project.org/4874 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Switched to more explicit signal/slot definitions (Q_SIGNALS/SLOTS).axis2011-04-271-1/+1
| | | | This is required for public headers.
* Initial import from the monolithic Qt.Qt by Nokia2011-04-27114-0/+18201
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 17:57:50 +0000