summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert changes to syncqt.Joerg Bornemann2010-06-071-392/+370
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-071-1/+1
|\
| * Fix style sheet error with slider handleqCaro2010-06-071-1/+1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-041-370/+392
|\ \
| * | deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann2010-06-041-4/+26
| * | syncqt: tabs changes to spacesJoerg Bornemann2010-06-041-369/+369
| |/
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-043-6/+40
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-043-6/+40
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-032-4/+4
|\ \ | |/
| * fix misleading hintOswald Buddenhagen2010-06-031-1/+1
| * support TARGETs with spacesOswald Buddenhagen2010-06-031-3/+3
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-032-2/+2
|\
| * propagate code change back to .g sourceOswald Buddenhagen2010-06-031-1/+1
| * double-quote string which contains a single-quoteOswald Buddenhagen2010-06-031-1/+1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-031-0/+3
|\ \
| * | Fix the bindTexture() filters on X11 to not rely on mipmap generation.Trond Kjernåsen2010-06-031-0/+3
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0314-36/+378
|\ \ \
| * | | Fix QWS build failureGareth Stockwell2010-06-031-1/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0314-35/+377
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0314-35/+377
| | |\ \ \
| | | * | | Removed compiler warningsGareth Stockwell2010-06-026-2/+14
| | | * | | Window visibility changes update TLW backing store reference countGareth Stockwell2010-06-022-8/+17
| | | * | | Enable visibility change events on all Symbian native windowsGareth Stockwell2010-06-021-0/+1
| | | * | | Added reference counting to QWidgetBackingStoreGareth Stockwell2010-06-028-29/+102
| | | * | | Added tst_QWidget::destroyBackingStoreWhenHiddenGareth Stockwell2010-06-021-0/+247
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-031-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-031-1/+1
| |\ \ \ \ |/ / / / /
| * | | | Windows CE: missing null check added in qapplication_win.cppJoerg Bornemann2010-06-021-1/+1
| |/ / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-031-0/+6
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-031-0/+6
| |\ \ |/ / /
| * | qmake: don't warn about unknown MSVC compiler option /MPJoerg Bornemann2010-06-021-0/+6
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-023-6/+48
|\ \ \
| * | | Clipping with rounded rectangles and QVG_SCISSOR_CLIPRhys Weatherley2010-06-023-6/+48
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-021-3/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-011-3/+0
| |\ \ \ |/ / / /
| * | | Remove workarounds for -rpath-link optionsAdrian Constantin2010-06-011-3/+0
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-011-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed alpha check for mono images.Kim Motoyoshi Kalland2010-06-011-0/+2
|/ / /
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-311-12/+0
|\ \ \ | |/ / |/| |
| * | Removed bogus autotest QFontMetrics::bearingIncludedInBoundingRectEskil Abrahamsen Blomfeldt2010-05-311-12/+0
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-313-2/+12
|\ \ \ | |_|/ |/| |
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-313-2/+12
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-311-4/+1
|\ \ \ | |_|/ |/| |
| * | Always construct s60 screen furniture even if not used.Janne Koskinen2010-05-311-4/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-315-4/+13
|\ \ \ | |_|/ |/| |
| * | Fix antialiasing with transformed text in OpenGL2 paint engineEskil Abrahamsen Blomfeldt2010-05-315-4/+13
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-302-12/+28
|\ \ \ | |_|/ |/| |
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-302-12/+28
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-285-434/+76
|\ \ \ | |_|/ |/| |
| * | Update def files for 4.6.3Shane Kearns2010-05-285-434/+76