summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation with qtbase master.HEADmasterDavid Faure2012-10-022-1/+4
| | | | | | | Both qMemCopy and QAbstractItemModel::reset have been deprecated. Change-Id: I222c807b344eec7ae292b48775baf51da9b650a8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Adding documentation templates from qtbaseJerome Pasion2012-09-253-0/+751
| | | | | | | Task-number: QTBUG-27293 Change-Id: I867d3828ed014772a626213978c6281fbfd2737b Reviewed-by: Martin Smith <martin.smith@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2420-373/+373
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I3b18af427f3cb6074ae63b3f2500a53115e558d9 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update the git-archive export optionsThiago Macieira2012-09-032-2/+4
| | | | | | | | | | | | | | The .gitattributes and .gitignore files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the $n string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: Ie7e14761be9a436fd6c7b258e6edfe75915abd4b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* use centralized handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-091-9/+2
| | | | | Change-Id: I34bd2d55f06d961db1b251ece544bf90d26ce7c9 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* remove references to $$QT_BUILD_TREEOswald Buddenhagen2012-06-264-4/+4
| | | | | Change-Id: Ib2554d92eec4dc0bac28a0db4ee18fa51739d02e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-269-31/+6
| | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - setup of PKGCONFIG* variables (automated now) - %mastercontent assignment (automated now) - pointless QPRO_PWD assignments - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: Ie75ffb4f3ff789a8bfa9f1ddbd92e13c9c9fafa7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-263-26/+5
| | | | | | | | | note that this changes the library version from 5.4.0 to 5.0.0. this is "less wrong", as in "it matches the real version of at least one of the involved parts". Change-Id: I41963d4187898414ed6e86f711cb873cd22ec904 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix build on Windows after qdatetime.h cleanupSimon Hausmann2012-06-121-0/+2
| | | | | | | | | Define NOMINMAX before including windows system header files, to prevent them from defining min/max as macros and thus breaking the usage of std::min/max in qdatetime.h Change-Id: I75573ae0bf05a40558a5eb1626bd3a296ee818da Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove another trace of the old plugin systemLars Knoll2012-05-312-2/+1
| | | | | Change-Id: Ife4f911a4b4ecebf0f74ec13694fea32aa5d348e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Move QIcon reference from QtWidgets to QtGui.ybot2012-05-205-5/+5
| | | | | Change-Id: I3e0de1442ee22a57dff2d7e2468e3c650c998ffc Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Adapt to _qpa file rename in qtbase.Girish Ramakrishnan2012-05-082-1/+2
| | | | | | | | qtbase change 36547f4eff44361f7a6acd0cff107c0e47561f93 renamed qpa headers. Change-Id: I62fe435069f44c1aeb97878a7d8a343109c89041 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.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>
* Use new plugin system in Phonon.Friedemann Kleint2012-02-2420-10/+23
| | | | | Change-Id: I8e2c005149fe1aa837697187c7401c06e0c05010 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed compile for QFSFileEngine removal.Rohan McGovern2012-02-221-3/+1
| | | | | Change-Id: If81975732f11385a103d77a86a28e4185d289fd4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3020-20/+20
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ibc0d7641c3d16ea4e6404b45f30e8775b33b4358 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2320-20/+20
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6f51b944e62f36841dc36e20f1567a6f54cba8ab Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0520-20/+20
| | | | | Change-Id: I1e4fa00dc4d0fb2ce01de4d1b4365e8fe820a0b3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove dependency on QDesktopServices deprecated API.Sergio Ahumada2012-01-022-2/+2
| | | | | | | | | QDesktopServices::storageLocation() is deprecated in favor of QStandardPaths::writableLocation(). Change-Id: I5c427d8f2a8d7cbffcca7938c184b07b0ba47ab5 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* QtPhonon: Fix gstreamer build on Linux when qpa is not defined.Friedemann Kleint2011-12-223-3/+3
| | | | | | | | | | Currently, qpa is contained in the CONFIG variable. We are working towards removing that since qpa (Lighthouse) is the default in Qt 5. Profiles/Source code should no longer contain conditional sections depending on qpa/Q_WS_QPA. Change-Id: I3ebe2ce201eeac6345a4abac365c3b66b3114d61 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QtPhonon: Fix building of tests on Windows.Friedemann Kleint2011-12-222-4/+3
| | | | | Change-Id: I86005a8f8e35ac37ea339af79b9d8a9a8cd37986 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove SkipMode parameter from QSKIP.Jason McDonald2011-10-211-3/+3
| | | | | | | | | | The SkipMode parameter has been removed from the API in qtbase, so it must be in all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I0f23668f3ca715c008869055cd6c3b9b131aad19 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't build empty test.Jason McDonald2011-10-123-60/+9
| | | | | | | | | | The mediaobject_wince_ds9 is for Windows CE only. Avoid building it as an empty test on other platforms. Change-Id: I7a661f6155f220d1791bda0dff606a258179c0d8 Reviewed-on: http://codereview.qt-project.org/6501 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@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>
* tests: eliminated usage of qttest_p4.prfRohan McGovern2011-10-103-6/+9
| | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: If1b29a37fd7bdc8aadb598761279bd156cdf343b Reviewed-on: http://codereview.qt-project.org/6284 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* videorenderer: Implement HWND-retrieval properly.Friedemann Kleint2011-09-301-2/+12
| | | | | | | Change-Id: I5ab678eeaaba498e802cc73d08f884ea5dcc0161 Reviewed-on: http://codereview.qt-project.org/5889 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Phonon: Compile examples.Friedemann Kleint2011-09-2910-14/+14
| | | | | | | Change-Id: I95b8cc8b05049ce19b94ff07eddc84e884adb043 Reviewed-on: http://codereview.qt-project.org/5787 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Phonon: Compile Windows.Friedemann Kleint2011-09-296-11/+38
| | | | | | | Change-Id: I5639a2e92437ae6e24227bd2676c7eaadb8d285d Reviewed-on: http://codereview.qt-project.org/5785 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* fixed wrong includes after refactoringMartin Zielinski2011-09-1918-31/+33
| | | | | | | | | 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>
* Remove obsolete testlib files from .gitignoreJason McDonald2011-08-231-2/+0
| | | | | | | Change-Id: Ie720bd31805bfe5730c3a7a549da596538b57a07 Reviewed-on: http://codereview.qt.nokia.com/3374 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove reference to qtdemo.Casper van Donderen2011-07-251-30/+4
| | | | | | | Change-Id: Ie0d44a3c4a10caea9cf5a458842370450e16237f Reviewed-on: http://codereview.qt.nokia.com/1492 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
* Update sync.profile dependencies to new syntaxAlan Alpert2011-07-081-10/+5
| | | | | | | | | | %dependencies now has a simpler format of gitmodule => %gitref instead of using qt modules and keywords. Change-Id: I785f30e24e0a793218e2e307bdde56067760c51d Reviewed-on: http://codereview.qt.nokia.com/1282 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-stagingQt Continuous Integration System2011-07-068-3/+4
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging: Merge the demos and examples in qtphonon.
| * Merge the demos and examples in qtphonon.Casper van Donderen2011-07-068-3/+4
| | | | | | | | Reviewed-By: David Boddie
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-stagingQt Continuous Integration System2011-06-082-4/+4
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging: Fix usage of QT_SOURCE_TREE
| * Fix usage of QT_SOURCE_TREEMarius Storm-Olsen2011-06-072-4/+4
| | | | | | | | Functionality has been moved into qt_example.prf
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-stagingQt Continuous Integration System2011-06-076-7/+7
|\ \ | |/ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging: Use feature profile loading instead of direct inclusion. Fixed DESTDIR after modularization.
| * Use feature profile loading instead of direct inclusion.axis2011-06-076-6/+6
| |
| * Fixed DESTDIR after modularization.axis2011-06-071-1/+1
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-stagingQt Continuous Integration System2011-05-271-0/+2
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging: tests: mark tst_mediaobject as unstable
| * tests: mark tst_mediaobject as unstableRohan McGovern2011-05-271-0/+2
| | | | | | | | | | | | | | | | | | This test refers to remotely-hosted media which is not under our control. This makes the test inherently unstable. Task: QTBUG-19539 Reviewed-by: Jason McDonald Change-Id: Id0ca83d4c9eb1133a8edc3927b659720990631ca
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-stagingQt Continuous Integration System2011-05-271-1/+4
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging: tests: improve failure messages from tst_mediaobject
| * tests: improve failure messages from tst_mediaobjectRohan McGovern2011-05-271-1/+4
| | | | | | | | | | | | | | | | Add some checks for Phonon::ErrorState, and make sure that the errorString() is put into the test failure log in this case. Reviewed-by: Jason McDonald Change-Id: I7e844b85c821df02ad562108d9752c7fc43534d5
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-stagingQt Continuous Integration System2011-05-2415-257/+257
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging: Update licenseheader text in source files for qtphonon Qt module
| * Update licenseheader text in source files for qtphonon Qt moduleJyri Tahtela2011-05-2415-257/+257
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-stagingQt Continuous Integration System2011-05-239-15/+91
|\ \ | |/ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging: Squashed commit of changes from the 4.8-temp branch. Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
| * Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-202-0/+22
| |