summaryrefslogtreecommitdiff
path: root/src/src.pro
Commit message (Expand)AuthorAgeFilesLines
* Remove QT 3 API support by default for INTEGRITY.Rolland Dudemaine2011-11-151-1/+1
* Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-221-1/+1
* Make sure the declarative plugin of QtWebKit is build once.Alexis Menard2011-06-301-4/+0
* Make sure JavaScriptCore is build once.Alexis Menard2011-06-301-7/+0
* Some qmake black magic to pick up the right file.Alexis Menard2011-06-031-1/+1
* Make QtWebKit build properly. QtWebKit is not just build by WebCore.pro butAlexis Menard2011-05-311-1/+1
* Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835Alexis Menard2011-05-301-6/+6
* Fix parallel buildsJoão Abecasis2011-02-171-0/+1
* Fixed a typo in src profile.axis2011-01-281-1/+1
* Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-221-1/+4
|\
| * Made javascriptcore depend on corelib.axis2010-10-041-1/+4
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-1/+2
|\ \ | |/
| * Fix dependency on the plugins rule for multimediaAndy Shaw2010-09-241-1/+2
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-191-0/+1
|\ \ | |/
| * Fixed circular dependency warning.axis2010-08-031-0/+1
* | Only list activeqt oncePaul Olav Tvete2010-08-181-1/+0
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-141-0/+11
|\ \ | |/
| * Added a top-level runonphone target for Qt and QtWebKit.axis2010-07-021-0/+11
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-241-2/+6
|\ \ | |/
| * Build declarative before webkit.Alexis Menard2010-06-231-2/+2
| * Remove the old WebView element in src/import. The new one is in src/3rdparty/...Alexis Menard2010-06-181-0/+4
* | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-181-20/+25
|\ \ | |/
| * Fix recursive targets for src.proMiikka Heikkinen2010-06-111-1/+1
| * fix escaping - by not using evalOswald Buddenhagen2010-05-271-8/+8
| * 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
| |/
* | Say hello to Qt for Native Client.Morten Johan Sørvig2010-05-141-0/+2
|/
* Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-231-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
View Lorry Controller Status