summaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Martin Jones2009-09-081-1/+2
|\
| * 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
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-311-2/+3
|\ \ | |/
| * Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-281-2/+3
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-251-3/+11
|\ \ | |/
| * 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 commit 'qt/master-stable'Jason Barron2009-08-041-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
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | 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
| |\ \ \ \
| * | | | | Long live Qt for S60!axis2009-04-241-0/+179
| / / / /
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-131-0/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-301-1/+1
|\ \ \ \ | |/ / /
| * | | Port of Qt to VxWorksRobert Griebl2009-07-291-1/+1
| | |/ | |/|
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-241-0/+4
|\ \ \ | |/ /
| * | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+4
| |/
* | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-221-1/+1
|\ \ | |/
| * Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-201-1/+1
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+168
* Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-0/+4
* Long live Qt!Lars Knoll2009-03-231-0/+168