summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add font related changes in 4.8 into changesJiang Jiang2011-07-041-3/+18
| | | | Reviewed-by: Eskil
* Store styleName in font databaseJiang Jiang2011-07-043-12/+38
| | | | | | | | | | | | | | | | So that queries like QFontDatabase::styles() can return exactly the same styles as the system does. Then application can use QFont::setStyleName() to select those styles later. With a lot of fonts not providing correct numeric weight/width values and even if they did, values are usually not directly mapped to QFont enums, styleName is probably the only reliable way to select any possible font in the system. Task-number: QTBUG-13518 Change-Id: Id8a9469b804f1b5bb81d8c7378e7e8778f9a4fff Reviewed-on: http://codereview.qt.nokia.com/739 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* update 4.8.0 changes fileaavit2011-07-011-1/+4
|
* Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-07-018-10/+47
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-07-017-9/+32
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Symbian socket engine: remove remaining todo comments Symbian: tune network autotest heap size so they can run on emulator Fix invalid read in QUrl::removeAllEncodedQueryItems Push the data together with the error in the synchronous case.
| | * Symbian socket engine: remove remaining todo commentsShane Kearns2011-06-302-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The writes >16k blocking in the emulator only applies to the winsock connectivity used in S60 SDKs. It doesn't affect the ethernet connectivity used by platform environments. Restarting notifier after error seems like the correct thing to do, and isn't causing any problems. The duplicated code for setting error strings is unfortunate, but a consequence of our decision not to derive from the native socket engine. If symbian ever gets a Qt5 port, we should revisit it there. Task-number: QTBUG-18371 Reviewed-by: Markus Goetz
| | * Symbian: tune network autotest heap size so they can run on emulatorShane Kearns2011-06-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Heap sizes were increased during development due to OOM failures, but the tests cannot be launched on emulator because of the address space problem (symbian emulator known issue) As the OOM failures were caused by unlimited buffering in the proxy socket engines (fixed by c4727a85eed57a4db698326a1bed4aa75b6e5284) the tests work on both emulator and hardware with the new buffer size. Task-number: QTBUG-18221 Reviewed-by: Markus Goetz
| | * Fix invalid read in QUrl::removeAllEncodedQueryItemsOlivier Goffart2011-06-282-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The remove will detach the string making the query pointer invalid. Note: the "test3" case is commented out because it does not remove the & at the end, and i do not want to enforce this behaviour in the test Task-number: QTBUG-20065 Change-Id: I195c5c3b468f46c797c7c4f8075303f2b1f4724c Reviewed-on: http://codereview.qt.nokia.com/822 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 2dd90a27a82289a5088b929c3bd27c1fd05967f6) Conflicts: tests/auto/qurl/tst_qurl.cpp
| | * Push the data together with the error in the synchronous case.Pierre Rossi2011-06-281-0/+1
| | | | | | | | | | | | | | | | | | | | | As it turns out some test cases in QtWebKit rely on this. Task-number: QTBUG-19556 Reviewed-by: mgoetz
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-301-1/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update 4.8.0 changes file
| | * | Update 4.8.0 changes fileShane Kearns2011-06-301-1/+15
| | | |
* | | | Fix resource leak in QFontEngineDirectWriteEskil Abrahamsen Blomfeldt2011-06-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug introduced by f54c5d9133d7aa7636988db36fa6cc51d26434b6. The release statement has to come before the return statement :) Reviewed-by: Jiang Jiang
* | | | Fix transformations on DirectWrite rasterized textEskil Abrahamsen Blomfeldt2011-06-302-47/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a few bugs in the DirectWrite font engine that caused transformed text to break. First of all, alphaMapForGlyph() ignored the transform, so no gray antialiased text would be transformed. Second of all, the imageForGlyph() function would use the wrong bounding box for the rasterized glyph, causing its positioning to become a little bit off when rotating. The fix is to get the bounding box from the system and add a margin to this instead of trying to predict how it will appear after the vertical hinting etc. has been applied. So that the positioning metrics are in sync with the actual metrics used by the alphaMap* functions, we also need to implement the alphaMapBoundingBox() function. Task-number: QTBUG-19829 Reviewed-by: Jiang Jiang
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-06-296-591/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove openvglite pluginPaul Olav Tvete2011-06-296-591/+0
| | | | | | | | | | | | | | | | | | | | | | | | This code does not compile, and it has not been maintained for almost two years. Reviewed-by: jlind
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-2925-225/+236
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix vertical positioning of glyphs in raster engine with FreeType Ensure a small event check interval on uikit platform. Change default application font for uikit platform. Use the QPoint memory layout change only on Desktop Mac Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices Add IPHONEOS deployment vars to makespec Post key events via QWindowSystemInterface, don't post events direcly Use nicer fonts and a few little patches to uikit platform. Update README and qmlapplicationviewer to suit 4.8. Updated proof-of-concept UIKit mkspecs
| * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-2825-225/+236
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix vertical positioning of glyphs in raster engine with FreeType Ensure a small event check interval on uikit platform. Change default application font for uikit platform. Use the QPoint memory layout change only on Desktop Mac Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices Add IPHONEOS deployment vars to makespec Post key events via QWindowSystemInterface, don't post events direcly Use nicer fonts and a few little patches to uikit platform. Update README and qmlapplicationviewer to suit 4.8. Updated proof-of-concept UIKit mkspecs
| | * | | Fix vertical positioning of glyphs in raster engine with FreeTypeJiang Jiang2011-06-281-3/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: aavit
| | * | | Ensure a small event check interval on uikit platform.con2011-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | For some reason I sometimes get huge nextTimerEvent() values.
| | * | | Change default application font for uikit platform.con2011-06-281-0/+6
| | | | |
| | * | | Use the QPoint memory layout change only on Desktop Maccon2011-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: gunnar
| | * | | Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservicescon2011-06-282-0/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Ritt Konstantin <ritt.ks@gmail.com>
| | * | | Add IPHONEOS deployment vars to makespecIan2011-06-272-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1275 Reviewed-by: con
| | * | | Post key events via QWindowSystemInterface, don't post events direclyIan2011-06-272-27/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1275 Reviewed-by: con
| | * | | Use nicer fonts and a few little patches to uikit platform.Ian2011-06-276-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1275 Reviewed-by: con
| | * | | Update README and qmlapplicationviewer to suit 4.8.con2011-06-276-43/+60
| | | | |
| | * | | Updated proof-of-concept UIKit mkspecsIan2011-06-278-133/+121
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1275 Reviewed-by: con
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-06-28141-2378/+2378
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Re-apply licenseheader text in source files for qt4.8
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-06-27141-2378/+2378
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: Re-apply licenseheader text in source files for qt4.8
| | * | | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-27141-2378/+2378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-06-272375-6769/+81102
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (182 commits) qsystemlibrary needs no special treatment my changelog for 4.8.0 Use numeric virtual keyboard for all number entry modes. Add a function that returns the D-Bus local machine ID QTBUG-17776, reporting terminated threads as not running on Symbian Splitview - Auto-translation rules changed Support clipboard function on Symbian Added qmlshadersplugin to Symbian qt.iby-file. Add an SSE4.2 even simpler version of toLatin1 Skip boundry neutral characters in bidi itemization Workaround webkit deadlock on macos x symbian socket engine: resolve some fixme and todo items trivial: fix typo in comment Fix QDeclarativeInspector when starting with ,block changelog docu update for QNX 6.5 get rid of anacronysm massive improvements for the QNX screen driver massive improvements for the QNX mouse driver massive improvements for the QNX keyboard driver ...
| | * | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-06-272375-6769/+81102
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-283-1/+5
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Reorder variable to eliminate warnings Only compare styleNames if they are not empty Add styleName to QFontDef comparison
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-27117-455/+2327
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (42 commits) qsystemlibrary needs no special treatment my changelog for 4.8.0 Use numeric virtual keyboard for all number entry modes. Add a function that returns the D-Bus local machine ID QTBUG-17776, reporting terminated threads as not running on Symbian Splitview - Auto-translation rules changed Support clipboard function on Symbian Added qmlshadersplugin to Symbian qt.iby-file. Add an SSE4.2 even simpler version of toLatin1 Workaround webkit deadlock on macos x QAuthenticator::setUser() parse user name in form user@domain tst_qnetworkreply: add a test for http abort. Disable antialiasing for tiled image drawing. Ensure visibility of input widget in QML app when doing layout switch Def update for gui, openvg, and opengl. Revert "Def update." Fix trailing whitespace Remove unnecessary resizes during orientation change Revert "Symbian: Fix QFontInfo::pixelSize()" Improving warning messages in QVolatileImage. ...
| | * | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-06-27117-455/+2327
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-271-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Reorder variable to eliminate warnings
| | * | | | | | Reorder variable to eliminate warningsJiang Jiang2011-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Frederik Gladhorn
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-272-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Only compare styleNames if they are not empty Add styleName to QFontDef comparison
| | * | | | | | Only compare styleNames if they are not emptyJiang Jiang2011-06-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19366
| | * | | | | | Add styleName to QFontDef comparisonJiang Jiang2011-06-252-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure we cache different font engines with different style names. Task-number: QTBUG-19366
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-06-2712-19/+130
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Make it compile with openssl 1.0.0d, gcc 4.6 QStringBuilder: do not crash with null char* Fix event delevery order QSocketNotifier autotest - fix compile with MSVC
| * | | | | | | Make it compile with openssl 1.0.0d, gcc 4.6Bernhard Rosenkraenzer2011-06-273-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSL_ctrl's prototype has changed slightly in openssl 1.0.0x - the 4th argument is now a void* as opposed to a const void*. gcc 4.6 doesn't allow this as an implicit cast. Merge-request: 1239 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * | | | | | | QStringBuilder: do not crash with null char*Olivier Goffart2011-06-273-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is supported by the others operator+ Change-Id: I9a1d1a0afb63acf32935948111d43ca6da370363 Reviewed-on: http://codereview.qt.nokia.com/764 Reviewed-by: hjk (cherry picked from commit 53a16752c257d2f4f99ecef2cde1580b817fc12a)
| * | | | | | | Fix event delevery orderOlivier Goffart2011-06-275-18/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions (such as QObject::moveToThread) did not keep the event ordered by priority. And because qUpperBound is used to add events, that mean new events would not be inserted in order. Task-number: QTBUG19637 Change-Id: I38eb9addb1cdd45b8566e000361ac6e5f1f2c2b8 Reviewed-on: http://codereview.qt.nokia.com/733 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit 7eeabcf70db658bca847498f618a94a375c95f5f)
| * | | | | | | QSocketNotifier autotest - fix compile with MSVCShane Kearns2011-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Sergio Ahumada
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-2710-30/+400
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon. Do not expose text when echo mode is not Normal. Check validator when changing text using accessibility functions. Fix some issues introduced in df6713b8f55fc007796f40. Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX. Avoid bogus accessibility focus events from menus. Build fix for Mac OS 10.5 Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden Notify a11y framework of FocusChanges for QGraphicsObject Call updateAccessibility on the QGraphicsObject in updateMicroFocus Fix updateAccessibility for QGraphicsObjects Make accessibility work on Windows with alien
| * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-06-23497-9295/+21219
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (269 commits) Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue DEF file updates for Symbian QTBUG-19883 Adding top level TRAP for QThreads on Symbian Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread" Fix alignment value not handled in ODF Silence a compiler warning about unhandled enum in switch Silence the "array out of bounds" warning in GCC 4.6. Silence the callgrind warnings in our source code when using gcc 4.6 Create a function that merges the SSE common code Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction Revert "Fix compilation of lrelease on Windows" QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread Also test http proxy in the QTcpServer benchmark Symbian QFileSystemWatcher: fix potential crash Enable QTcpServer benchmark on symbian Fix building the OpenVG graphicssystem on Linux with static libs fix build on windows 7 Fix compilation of lrelease on Windows Allow selecting fonts with irregular style names When asking for relations, don't crash on children that don't return an interface. ...
| | * | | | | | | | Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValueJosé Millán Soto2011-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1263 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | * | | | | | | | Merge remote-tracking branch 'upstream/4.8'Frederik Gladhorn2011-06-2033-272/+616
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.8'Frederik Gladhorn2011-06-20473-9147/+20727
| | |\ \ \ \ \ \ \ \ \