summaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-181-5/+15
|\
| * Update the dependencies in src.pro because we don't have a good buildsystemThiago Macieira2010-05-141-5/+15
* | Removed mediaservices.Kurt Korbatits2010-05-181-6/+1
|/
* Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-221-1/+1
|\
| * Build fix for mingwThierry Bastian2010-04-201-1/+1
* | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-2/+6
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-131-4/+4
|\
| * QtWebKit: Change the dependency from phonon to QtMultimedia.Jocelyn Turcotte2010-04-071-2/+2
| * QtWebKit: Re-add the dependency to the static linked JavaScriptCoreJocelyn Turcotte2010-04-061-2/+2
* | fix build from top levelOswald Buddenhagen2010-04-121-13/+6
* | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-4/+5
|/
* Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-051-1/+1
* Make multimedia only depend on opengl when the latter is buildThomas Zander2010-03-191-1/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-1/+1
|\
| * Make QGLShaderProgram-dependency in QtMultimedia explicit in src.proTor Arne Vestbø2010-03-151-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-1/+6
|\ \ | |/
| * Fix buildHarald Fernengel2010-03-081-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-041-2/+0
| |\
| | * Remove dependency on declarative from multimedia.Justin McPherson2010-03-031-1/+0
| * | Fix build of importsTobias Hunger2010-03-021-0/+6
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-2/+3
|\ \ | |/
| * Express dependencies for QtMultimedia.Justin McPherson2010-02-151-2/+3
* | Implemented recursive "sis" target and enabled sis_targets feature.axis2010-02-231-1/+5
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-121-0/+1
|\ \ | |/
| * Fix the parallel build of QtWebKitSimon Hausmann2010-01-221-0/+1
* | Fixed makefile generation for Symbian.axis2010-01-141-3/+5
|/
* Fix failing sub-src targetMarius Storm-Olsen2009-11-101-1/+1
* Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-091-28/+5
|\
| * Ensure IDC and UIC3 dependencies are correctMarius Storm-Olsen2009-11-051-1/+3
| * Add src/tools/tools.pro, and use when building host tools for xcompilingMarius Storm-Olsen2009-11-041-28/+3
* | Declarative building infrastructure.Warwick Allison2009-11-041-0/+5
|/
* Fixed compile failure when running make with large -j.Rohan McGovern2009-09-281-0/+1
* Only depend on phonon when building webkit if phonon was configured forAndy Shaw2009-09-071-1/+2
* Added a phonon dependency to webkitDenis Dzyubenko2009-09-041-1/+1
* Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-281-2/+3
* Merge commit 'qt/master'Jason Barron2009-08-211-3/+4
|\
| * add configure options for (not) building the QtScript moduleKent Hansen2009-08-071-2/+3
* | Merge commit 'qt/master-stable'Jason Barron2009-08-061-0/+4
|\ \ | |/
| * Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+4
* | Merge commit 'qt/master-stable'Jason Barron2009-08-041-1/+1
|\ \ | |/
| * Port of Qt to VxWorksRobert Griebl2009-07-291-1/+1
* | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-091-1/+1
|\ \
| * | Fix compilation on WinCE by using correct scopes.Jason Barron2009-07-071-1/+1
* | | Remove some of the symbian workarounds from src.pro.Jason Barron2009-07-081-7/+1
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-0/+4
|\ \ \ | |/ / |/| / | |/
| * Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+4
* | Fix building on other platforms.Jason Barron2009-05-201-2/+3
* | Second attempt at enabling Phonon.Frans Englich2009-05-181-1/+2
* | Enable phonon, if enabled in configure.Frans Englich2009-05-051-1/+1
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-271-1/+1
|\ \ | |/