summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Allow selecting fonts with irregular style namesJiang Jiang2011-06-1011-96/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fonts like "Helvetica Neue UltraLight" or "Skia Regular Black Condensed" can't be selected in Qt because either they don't report correct numeric values for weight/stretch/etc. or these values are not mapped from QFont enums in a linear way. Thus we provide a shortcut to select these fonts with PostScript name or full name without resorting to family name matching in QFontDatabase (these fonts are not registered in font database anyway). After this, we can simply use: QFont font("Helvetica Neue"); font.setStyleName("UltraLight"); to select these fonts. QCoreTextFontEngineMulti matched like this can be created directly from the CTFontRef instance instead of creating from the font name, making this process faster. The commit also cleaned up the font loading process in Mac font database a bit, moving the code for family matching into a separate function. Add QFontInfo::styleName() and QRawFont::styleName() to access the resolved style name for a font. Task-number: QTBUG-19366 Change-Id: Iad07768c02ed06cc8d6b7395dec554384f410506 Reviewed-on: http://codereview.qt.nokia.com/333 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> (cherry picked from commit 97391be5ebddc62545ddb88f92fc2045bfa10711)
* Fix missing empty lines in Qt HTML when displayed in compliant browsersEskil Abrahamsen Blomfeldt2011-06-101-1/+1
| | | | | | | | | | | | | | | When QTextDocument exports HTML, it makes an effort to be compatible with its own importer, hence it has to be compatible with the dialect of HTML which Qt has developed over the years. One incorrect interpretation in Qt is that an empty paragraph is interpreted as an empty line. So if you use a QTextDocument to produce HTML for text where an empty line has been added, this empty line will not be visible when the document is viewed in a compliant browser. The fix is to set the height of the empty paragraph to 1em, so that it will match the current pixel size of the font, thus look the same as a <p><br /></p> but without altering the structure of the document. Reviewed-by: Gunnar
* Merge remote branch 'qt-mainline/4.8'aavit2011-06-09126-2996/+5102
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-0818-341/+376
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fix autotest on Windows Compile on Mac OS X Ammend last commit Implemented QAccessibleTextEdit::attributes() Changing cursor position in all boundaries code clean-up for QSystemSemaphore simplify QSharedMemoryPrivate::cleanHandle() minor improvements for QSharedMemory fix potential keyfile leaking refactoring of the QWSSharedMemory class allow the user to averride QT_QWS_TEMP_DIR in qplatformdefs.h minor typo fix minor code simplification minor code simplification avoid the QT_NO_ASCII warning remove an unused headers nano optimization don't reallocate memory if the old buffer has sufficient capacity fix potential memory leaking don't delete the lock if it was not created by this surface ...
| | * Fix autotest on WindowsHarald Fernengel2011-06-081-6/+2
| | |
| | * Compile on Mac OS XHarald Fernengel2011-06-081-3/+5
| | |
| | * Ammend last commitHarald Fernengel2011-06-061-1/+1
| | | | | | | | | | | | Squelch coding style warnings
| | * Implemented QAccessibleTextEdit::attributes()José Millán Soto2011-06-061-5/+106
| | | | | | | | | | | | | | | | | | | | | | | | Handling font properties and colors Created test: tst_QAccessibility::textAttributes Merge-request: 2626 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * Changing cursor position in all boundariesJosé Millán Soto2011-06-061-1/+1
| | | | | | | | | | | | | | | Merge-request: 1242 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * code clean-up for QSystemSemaphoreRitt Konstantin2011-06-064-61/+65
| | | | | | | | | | | | | | | Merge-request: 1248 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * simplify QSharedMemoryPrivate::cleanHandle()Ritt Konstantin2011-06-065-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | by making it return nothing as it's result should be ignored anyways (initKey() and detach() could return false because of it - which is wrong) Merge-request: 1248 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * minor improvements for QSharedMemoryRitt Konstantin2011-06-065-80/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unused includes; generate error string if error occurred only; make some error strings equal on different platforms; avoid code duplication; minor code simlifications and clean-ups Merge-request: 1248 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * fix potential keyfile leakingRitt Konstantin2011-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | according to close(2) manpages, it could return with EINTR; use EINTR-safe version of close() from qcore_unix_p.h Merge-request: 1248 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * refactoring of the QWSSharedMemory classRitt Konstantin2011-06-062-107/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drop old/unused API and obsolete code; improve attach() for comon case; cache the shm size at the first call; fix the includes; better debug strings; minor code clean-ups Merge-request: 1247 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * allow the user to averride QT_QWS_TEMP_DIR in qplatformdefs.hRitt Konstantin2011-06-061-1/+1
| | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * minor typo fixRitt Konstantin2011-06-061-1/+1
| | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * minor code simplificationRitt Konstantin2011-06-061-5/+3
| | | | | | | | | | | | | | | | | | | | | there is no need in non-const object as we don't change it anyways Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * minor code simplificationRitt Konstantin2011-06-062-21/+14
| | | | | | | | | | | | | | | | | | | | | `ascii` wasn't used Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * avoid the QT_NO_ASCII warningRitt Konstantin2011-06-061-1/+1
| | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * remove an unused headersRitt Konstantin2011-06-061-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | these headers weren't used anymore since QLock, QWSLock and QWSSharedMemory classes had been introduced Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * nano optimizationRitt Konstantin2011-06-061-9/+5
| | | | | | | | | | | | | | | | | | | | | allocate uninitialized QByteArray as it will be initialized few lines later Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * don't reallocate memory if the old buffer has sufficient capacityRitt Konstantin2011-06-061-8/+11
| | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * fix potential memory leakingRitt Konstantin2011-06-061-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the `memsize` member was never set with anything but 0; so, the memory newer was freed neither in destructor, neither in releaseSurface(). for the first one it was non-critical because of the memory was freed indirectly - by hiding widget before closing (which is why the issue wasn't catched-up until now) Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * don't delete the lock if it was not created by this surfaceRitt Konstantin2011-06-061-2/+6
| | | | | | | | | | | | | | | | | | | | | and don't forget about it otherwise Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * QSessionManager: fix build on QWSRitt Konstantin2011-06-061-0/+3
| | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-0871-1241/+4276
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits) Update internal state before emitting configurationChanged() signals. Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain. Reset input context in Symbian when another window is opened. KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget() Close context menus during orientation change. Have -small-screen enabled in certain examples on Symbian always. Update Japanese translations. Revert some of "Make QMLViewer startup animation stop after a while" Fix for winscw QtGui.def Add private method for flushing the pixmap cache. QDeclarative: Fix QPerformanceTimer on Symbian Fix QTreeWidget autotest cases on Symbian/VGA Increase SSL readbuffer 1 -> 16 kB Fix pixel metrics for Symbian VGA devices Revert "Fix QNetworkConfigurationManager usage outside main thread first" Avoid buffer overrun in QMacPixmapData resizing Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting Fix tst_QGraphicsItem::sorting() test case for Symbian Fix QHeaderView test case for VGA Symbian devices. ...
| | * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-081-0/+1
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-081-0/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update internal state before emitting configurationChanged() signals.
| | | | * | Update internal state before emitting configurationChanged() signals.Xizhi Zhu2011-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PMO Bug 257336.
| | * | | | Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7Toby Tomkins2011-06-0844-1417/+453
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qs60style.cpp
| | * \ \ \ \ Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7Toby Tomkins2011-06-082-10/+15
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-06-081-10/+10
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain.
| | | | * | | | Fixed qmlshadersplugin on windows VC2008 toolchain.Marko Niemelä2011-06-081-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is originally submitted by George Tavares. APIENTRY is a Win32 macro defined as stdcall__ * Reviewed-by: Kim Gronholm
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-06-071-0/+5
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Reset input context in Symbian when another window is opened.
| | | | * | | | Reset input context in Symbian when another window is opened.Miikka Heikkinen2011-06-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When symbol menu is opened, input context needs to be reset or preedit string duplication may occur after symbol menu is closed. Task-number: QTBUG-19528 Reviewed-by: Sami Merila
| | * | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-072-0/+9
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-06-071-0/+2
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
| | | | * | | | KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()Sami Merila2011-06-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no check if graphics view pointer is null in the SLOT function translateInputWidget(). Task-number: QTBUG-19734 Reviewed-by: Miikka Heikkinen
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-06-061-0/+7
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Close context menus during orientation change. Have -small-screen enabled in certain examples on Symbian always.
| | | | * | | | Close context menus during orientation change.Laszlo Agocs2011-06-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make non-native QMenus, i.e. context menus, work like in Avkon. Reviewed-by: Miikka Heikkinen Reviewed-by: Sami Merila Task-number: QTBUG-19656
| | * | | | | | Merge branch '4.7' into qt-4.8-from-4.7Liang Qi2011-06-0610-44/+41
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_ft.cpp src/s60installs/bwins/QtGuiu.def
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-06-041-7/+7
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for winscw QtGui.def
| | | | * | | | Fix for winscw QtGui.defJani Hautakangas2011-06-021-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-045-36/+16
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Revert some of "Make QMLViewer startup animation stop after a while" Add private method for flushing the pixmap cache.
| | | | * | | | | Revert some of "Make QMLViewer startup animation stop after a while"Alan Alpert2011-06-033-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts most of commit c6e6a35aeb8794d68a3ca0c4e27a3a1181c066b5. Only the startup.qml changes were meant to go in. The other stuff is an experimental feature that was not supposed to be merged in. Reviewed-by: Michael Brasser
| | | | * | | | | Add private method for flushing the pixmap cache.Michael Brasser2011-06-022-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7330383b89a3a313dd845274d17d38c714db20ce Reviewed-by: Martin Jones
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-06-015-8/+30
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Avoid buffer overrun in QMacPixmapData resizing Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting Missing glyphs transforming QStaticText on X11/raster with subpixel AA Fixed clipping errors for non-extended paint engines.
| | | | * | | | | | Avoid buffer overrun in QMacPixmapData resizingJiang Jiang2011-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shouldn't use size bigger than the original (source) pixels buffer or the new one (just allocated). Task-number: QTBUG-18547 Reviewed-by: aavit
| | | | * | | | | | Fix glyph metrics with QStaticText/Freetype/raster and light/no hintingEskil Abrahamsen Blomfeldt2011-05-311-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a back-port of part of cad70d64d0bbada. In the raster engine's drawCachedGlyphs(), which is used by QStaticText, we would use the wrong metrics to lay out the glyphs, because loadGlyphMetrics() would assume full hinting. A visible effect of this was that the baseline of rotated text became wavy. Task-number: QTBUG-18185 Reviewed-by: Jiang Jiang
| | | | * | | | | | Missing glyphs transforming QStaticText on X11/raster with subpixel AAEskil Abrahamsen Blomfeldt2011-05-302-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static text took an untested and broken code path for the combo of subpixel AA, X11, raster engine and transformation. This would cause missing glyphs. The reason was that QStaticText took an unused code path which turned out not to work. The workaround is to use gray AA on transformed text, like we already do for the GL engine. In Qt 4.8, the static text code path has been rewritten to use the Freetype cache instead of the image glyph cache, so the bug will be fixed more properly there. Reviewed-by: Samuel
generated by cgit v0.12 at 2025-01-25 09:17:20 (GMT)