summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-081-12/+0
|\
| * Optimize behavior of QGLTextureCacheHarald Fernengel2010-12-071-12/+0
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-071-0/+3
|\
| * Add library prefixes for Cygwinİsmail Dönmez2010-12-071-0/+3
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-063-3/+21
|\ \
| * | Revert "QSystemTrayIcon::messageTimeout() signal implemented"Paul Olav Tvete2010-12-065-75/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-068-4/+96
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-048-4/+96
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-038-4/+96
| | | |\ \
| | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-028-4/+96
| | | | |\ \
| | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-018-4/+96
| | | | | |\ \
| | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-018-4/+96
| | | | | | |\ \
| | | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-308-4/+96
| | | | | | | |\ \
| | | | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-298-4/+96
| | | | | | | | |\ \
| | | | | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-11-29340-6284/+22458
| | | | | | | | | |\ \
| | | | | | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-285-1/+75
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-265-1/+75
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * | QSystemTrayIcon::messageTimeout() signal implementedminiak2010-11-265-1/+75
| | | | | | | | | * | | | | print out which GLSL shader that failed compilation for better debuggingGunnar Sletta2010-11-281-2/+19
| | | | | | | | | * | | | | --warnGunnar Sletta2010-11-241-0/+1
| | | | | | | | | * | | | | compile with debug defined enabledGunnar Sletta2010-11-241-1/+1
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-0612-63/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | QGtkStyle: Use gtk_progress_configure() instead of adjustment APIAndreas Kling2010-12-063-15/+5
| * | | | | | | | | | | | Move test data to a qrc file.Jedrzej Nowacki2010-12-069-48/+25
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-061-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | / / / / / / / / / / / | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix license header.Jason McDonald2010-12-061-5/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-12-0339-7/+7124
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Make it compile on Mac OS X 10.5Robert Griebl2010-12-031-2/+2
| * | | | | | | | | | Touch events do not work on Mac OS 10.5Robert Griebl2010-12-031-2/+10
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-12-0339-7/+7116
| |\ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-12-0239-7/+7116
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Simple fixes for CI gateRobert Griebl2010-12-024-4/+44
| | * | | | | | | | | Fix compile on QWSRobert Griebl2010-12-021-1/+1
| | * | | | | | | | | Fix code style issues in QScrollerRobert Griebl2010-12-023-8/+8
| | * | | | | | | | | QScroller merge, part 1Robert Griebl2010-12-0239-7/+7076
| | |/ / / / / / / /
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-035-8/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Changed various DEPLOYMENT variable ".sources" suffixes to ".files"Miikka Heikkinen2010-12-025-8/+8
| |/ / / / / / / /
* | | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-12-0260-1192/+2145
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Restore patch that got lost in mergeJørgen Lind2010-12-022-3/+66
| * | | | | | | | | Fix spelling in commentJørgen Lind2010-12-021-1/+1
| * | | | | | | | | Spelling mistakes in Documentation. There are probably more :)Jørgen Lind2010-12-013-10/+10
| * | | | | | | | | Fix spelling mistake in QEGLPlatformcontextJørgen Lind2010-12-014-4/+4
| * | | | | | | | | Restore patch that disappeared in mergeJørgen Lind2010-12-012-3/+3
| * | | | | | | | | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-3011-52/+579
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-29835-20340/+34323
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Make the openKODE use the new eventloopintegration api.Jørgen Lind2010-11-264-14/+24
| * | | | | | | | | Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-269-49/+110
| * | | | | | | | | Move the Lighthouse specfic api into qpa_qpa.cppJørgen Lind2010-11-263-12/+22
| * | | | | | | | | Lighthouse: Fix QGLContext::currentContext for systems with limitedJørgen Lind2010-11-2413-68/+141
| * | | | | | | | | Make EglFS plugin compile after changes to QPlatformEGLContextGunnar Sletta2010-11-231-1/+1