summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'integration/qt-master-from-4.7' into HEADThiago Macieira2011-03-162-5/+10
|\
| * QTcpSocket: Fix for disconnect in Unbuffered mode.Markus Goetz2011-03-162-5/+10
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-157-14/+101
| |\
* | \ Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-1631-110/+1824
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-164-16/+179
| |\ \ \
| | * | | QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.Tapani Pälli2011-03-161-1/+1
| | * | | Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-163-15/+178
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-161-3/+5
| |\ \ \ \
| | * | | | Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-161-3/+5
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-1515-19/+1484
| |\ \ \ \ \
| | * | | | | Hot fix for compilation without QGL_USE_TEXTURE_POOLJani Hautakangas2011-03-151-0/+2
| | * | | | | Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-1515-19/+1482
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-151-22/+25
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Adjust right bearing when breaking with line separatorsJiang Jiang2011-03-151-22/+25
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-1511-43/+63
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-151-6/+8
| | |\ \ \ \
| | | * | | | Avoid panics in QDesktopWidget on Symbian emulator.Laszlo Agocs2011-03-151-6/+8
| | * | | | | QS60Style: use placeholder texture when polishing widgets and paletteSami Merila2011-03-153-7/+33
| | * | | | | Regression: QS60Style: Theme background is incorrectSami Merila2011-03-151-0/+1
| | |/ / / /
| | * | | | Remove changes from fix to QTBUG-17045 that were not related to the fixSami Merila2011-03-151-12/+16
| | * | | | Prevent null pointer crash when closing splitviewSami Merila2011-03-152-17/+14
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-146-7/+19
| | |\ \ \ \
| | | * \ \ \ Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-146-7/+19
| | | |\ \ \ \
| | | | * | | | Fixed a typo in src profile.axis2011-03-041-1/+1
| | | | * | | | Fixed a build library deployment issue in sqlite.axis2011-03-041-0/+6
| | | | * | | | Fixed include in network module on Symbian.axis2011-03-041-1/+1
| | | | * | | | Support to build Qt for Symbian on Mac OS X with gcce compiler.axis2011-02-211-1/+1
| | | | * | | | Changed various qmake constructs to support Windows.axis2011-02-181-2/+8
| | | | * | | | Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-182-2/+2
| | * | | | | | QS60Style slows down layout switch by updating widgets unnecessarilySami Merila2011-03-143-22/+0
| | |/ / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-154-7/+72
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Border still drawn on Rectangle elements when border.width == 0Martin Jones2011-03-151-2/+2
| | * | | | | Regression: currentIndex was not set correctly after model cleared.Martin Jones2011-03-152-5/+7
| | * | | | | Remove bindings before assigning constants in VMEAaron Kennedy2011-03-151-0/+63
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-141-4/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Prevented infinite recursion in QPainterPath::contains().Samuel Rødal2011-03-141-4/+4
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-142-3/+25
| |\ \ \ \ \ \
| | * | | | | | QNAM HTTP: error() in case connection is closed unexpectedlyMarkus Goetz2011-03-141-1/+14
| | * | | | | | SSL: Fix certification loading on Mac OS X 10.5Martin Petersson2011-03-141-2/+11
* | | | | | | | Merge earth-team into masterOlivier Goffart2011-03-1524-66/+203
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | SSL: give protocol enum SecureProtocols an own valuePeter Hartmann2011-03-154-6/+8
| * | | | | | | SSL backend: avoid setting SNI hostname for old SSL versionsPeter Hartmann2011-03-142-2/+5
| * | | | | | | SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3)Peter Hartmann2011-03-145-5/+8
| * | | | | | | SSL: introduce new option TlsV1SslV3 for SSL communicationPeter Hartmann2011-03-143-1/+10
| * | | | | | | Mac Style: Compile FixMartin Petersson2011-03-141-1/+1
| * | | | | | | Mac: Center the Window title on Cocoa.Martin Petersson2011-03-101-0/+2
| * | | | | | | Fix corner of scroll area so it is stylable on Mac.Martin Petersson2011-03-101-1/+1
| * | | | | | | QNAM HTTP: Pair channels with requests at a later state.Martin Petersson2011-03-103-24/+48
| * | | | | | | Windows: Activate the context menu on tray icons when shown.Martin Petersson2011-03-101-0/+1
| * | | | | | | SSL backend: check at runtime for the right OpenSSL version for SNIPeter Hartmann2011-03-044-3/+9