summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-223-2/+19
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-03-21440-4580/+19637
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-213-2/+19
| | |\
| * | \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-03-213-2/+19
| |\ \ \ | | | |/ | | |/|
| | * | Optimized glyph uploads in GL texture cache.Samuel Rødal2011-03-213-2/+19
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-229-54/+163
|\ \ \ \
| * | | | Designer: Avoid nested QDialog's in item widget content dialogs.Friedemann Kleint2011-03-229-54/+163
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-2212-22/+93
|\ \ \ \ \
| * \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-1912-22/+93
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-195-14/+34
| | |\ \ \ \ \
| | | * | | | | Add flag for forcibly propagating backing store alpha to framebufferGareth Stockwell2011-03-184-13/+33
| | | * | | | | Fixed unmatched quotes in s60installs.proGareth Stockwell2011-03-181-1/+1
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-186-7/+58
| | |\ \ \ \ \ \
| | | * | | | | | Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-186-7/+58
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-181-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Add /q switch to QMAKE_DEL_FILE command in symbianMiikka Heikkinen2011-03-181-1/+1
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-213-5/+17
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Designer: Remember default of main container's object name.Friedemann Kleint2011-03-212-3/+15
| * | | | | | | Designer: Do not translate page object names of QMdiArea.Friedemann Kleint2011-03-211-2/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-2153-915/+2565
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-21440-4580/+19637
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-196-26/+234
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-186-26/+234
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-173-5/+76
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Changes to driver workarounds.Robin Burchell2011-03-171-2/+25
| | | * | | | | Switch to raster also when last window is destroyed (on MeeGo).Samuel Rødal2011-03-171-1/+38
| | | * | | | | Clipboard/Windows: Fix a hang when sending to non-responsive clients.Friedemann Kleint2011-03-171-2/+13
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-173-21/+158
| | |\ \ \ \ \ \
| | | * | | | | | Fix accidental population of the disk cache with partial contentSimon Hausmann2011-03-172-0/+100
| | | * | | | | | Fix disk cache interaction for range retrieval HTTP requests.Simon Hausmann2011-03-172-21/+58
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-182-4/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | qmake vcproj generator: do not insert $(INHERIT)Joerg Bornemann2011-03-182-4/+5
* | | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-03-18197-1566/+9267
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes detected by the static-checkJørgen Lind2011-03-174-4/+86
| * | | | | | | | | Fixup license headers in Lighthouse pluginsJørgen Lind2011-03-17101-113/+441
| * | | | | | | | | Mac: add autorelease pools to create_sysMorten Sorvig2011-03-171-0/+4
| * | | | | | | | | Don't skip remaining events on unhandled events in xcb backend.Samuel Rødal2011-03-171-2/+6
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-17730-6261/+24045
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Lighthouse: Xcb, compile fix for the glx pathJørgen Lind2011-03-161-0/+2
| * | | | | | | | | | Lighthouse: Make sure we don't use xkbcommonJørgen Lind2011-03-162-5/+16
| * | | | | | | | | | Lighthouse: Add pkg-config check for opengl es2Jørgen Lind2011-03-161-1/+10
| * | | | | | | | | | Rename qnaclunimplemented -> qfunctions_naclMorten Sorvig2011-03-168-9/+14
| * | | | | | | | | | Rename qconfig-minimal-system-depenencies.hMorten Sorvig2011-03-162-2/+2
| * | | | | | | | | | Add QT_NO_FILESYSTEMITERATOR.Morten Johan Sørvig2011-03-165-0/+30
| * | | | | | | | | | Add QT_NO_DYNAMIC_LIBRARY.Morten Johan Sørvig2011-03-161-7/+11
| * | | | | | | | | | Compile.Morten Johan Sørvig2011-03-161-1/+5
| * | | | | | | | | | NaCl: Dont force release builds.Morten Johan Sørvig2011-03-161-2/+0
| * | | | | | | | | | NaCl: disable libtiff. Morten Johan Sørvig2011-03-161-0/+1
| * | | | | | | | | | posix platformdefs: Add QT_NO_SOCKET_H.Morten Johan Sørvig2011-03-161-1/+3
| * | | | | | | | | | qpnghandler: Compile with QT_NO_IMAGE_TEXT.Morten Johan Sørvig2011-03-161-0/+2