summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Update QTBUG-17223 for Qt 4.8Shane Kearns2011-05-093-1/+16
* Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-094-1/+19
* Fix QNetworkReplyImpl error handlingShane Kearns2011-05-091-4/+13
* Enable per network configuration proxy settings in QNetworkAccessManagerShane Kearns2011-05-092-27/+53
* Allow a network configuration to be included in a proxy queryShane Kearns2011-05-093-4/+123
* Fix error handling in write for socks socket engineShane Kearns2011-05-091-1/+6
* Merge remote-tracking branch 'mainline/master' into earthOlivier Goffart2011-05-06144-1361/+1910
|\
| * uic: Remove Q3Support.Friedemann Kleint2011-05-064-431/+15
| * Dont do doneCurrent in swapBuffersJørgen Lind2011-05-051-1/+0
| * compile openvg with private headersMarius Storm-Olsen2011-05-051-2/+2
| * Only enable design metrics for scalable fontsJiang Jiang2011-05-051-1/+1
| * Add a way to retrieve CTFontRef from QFontJiang Jiang2011-05-052-3/+6
| * Add Q_UNIMPLEMENTED() macroKent Hansen2011-05-041-0/+4
| * Fix build error on MacPrasanth Ullattil2011-05-041-1/+1
| * Build fixPaul Olav Tvete2011-05-041-0/+1
| * BC cleanup in uitools.Friedemann Kleint2011-05-041-1/+1
| * Remove QFontEngineFT::loadGlyphMetricsJiang Jiang2011-05-042-101/+0
| * Add required font metrics functions to QRawFontJiang Jiang2011-05-042-0/+56
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-041-0/+8
| |\
| | * Include pixel size of font in exported HTML from QTextDocumentEskil Abrahamsen Blomfeldt2011-05-041-0/+8
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-0438-85/+145
| |\|
| | * Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-0230-76/+87
| | * Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-0210-5/+41
| | * QNetworkConfigurationManager: Fix network polling.Martin Petersson2011-05-022-2/+14
| | * QAbstractSocket: Fix waitForReadyRead infinite loop.Martin Petersson2011-05-021-2/+2
| | * Fix compile warning on WindowsMartin Petersson2011-05-021-0/+1
| * | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtqu...Gunnar Sletta2011-05-0430-144/+224
| |\ \
| | * | Compile on WindowsEskil Abrahamsen Blomfeldt2011-05-041-1/+1
| | * | Remove warningsJørgen Lind2011-05-043-1/+3
| | * | Fix Wayland plugin so it works with the wayland bind apiJørgen Lind2011-05-045-50/+26
| | * | wayland: Track wayland changesKristian Høgsberg2011-05-045-21/+12
| | * | Support GL ES 2 with uikit.con2011-05-046-43/+101
| | * | Lighthouse: Fix virtual desktopwidgetJørgen Lind2011-05-042-9/+4
| | * | Support gamma correction of text on GLEskil Abrahamsen Blomfeldt2011-05-036-12/+60
| | * | Make pixel size a qreal in QRawFontEskil Abrahamsen Blomfeldt2011-05-022-5/+5
| | * | Support more items for QTextCharFormat::VerticalAlignment enum for custom tex...Dmitry Zelenkovsky2011-05-022-3/+13
| * | | Make it possible for animation driver to specify the advance time deltaGunnar Sletta2011-05-043-23/+61
| |/ /
| * | Use maximum ascent/descent/leading from fallback fonts in shapingJiang Jiang2011-04-296-8/+20
| * | Another ugly hack to make bidi cursor work with Core TextJiang Jiang2011-04-291-3/+24
| * | Make sure layoutData exist before checking for string directionJiang Jiang2011-04-291-0/+2
| * | Take leading space width into account for painting and selectionJiang Jiang2011-04-292-1/+4
| * | Remove extra comma at the end of enum listJiang Jiang2011-04-291-1/+1
| * | Don't transform glyph positions for Core Graphics paint engineJiang Jiang2011-04-291-2/+3
| * | Turn on HarfBuzz support for Mac/CocoaJiang Jiang2011-04-292-1/+36
| * | Support visual cursor movement for BIDI textJiang Jiang2011-04-2914-272/+627
| * | Make sure QFont's resolve mask is copied on compilers with C++0x supportEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| * | Fix glyph position issue with fallback fontsJiang Jiang2011-04-291-0/+3
| * | Fix crash in raster on X11 when text contains unsupported charactersEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| * | doc: Minor cleanup in QGlyphs docsEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| * | doc: Simplify language in QGlyphs docsEskil Abrahamsen Blomfeldt2011-04-291-2/+2