summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-08-031-3/+6
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| * Mac: Fix crash in QCoreTextFontEngineMulti when disabling font kerning.Morten Sørvig2009-07-301-1/+1
| | | | | | | | | | | | CFDictionaryAddValue expects a CFNumberRef, not a pointer-to-CFNumberRef. Reviewed-by: TrustMe
| * Fix crash when printing to PDF on Qt/MacMorten Sørvig2009-07-271-2/+5
| | | | | | | | | | | | | | | | | | | | Priting to PDF would crash for applications built on Leopard when running on Tiger. Add the standard runtime version check to QFontEngineMac::faceId(). Task-number: 251791 Reviewed-by: Richard Moe Gustavsen
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtAaron Kennedy2009-07-311-2/+2
|\ \
| * | Don't do two hash lookups in loadGlyphs()Eskil Abrahamsen Blomfeldt2009-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | loadGlyphs() has a big impact on text rendering speed on X11. Removing the uneeded hash lookup makes this function go twice as fast, as it in the common case (where the glyphs are already cached) the hash lookups are 100% of the running time of the function. Reviewed-by: Trond
* | | Export QTextControlAaron Kennedy2009-07-311-1/+1
|/ / | | | | | | | | | | This class is used in declarative. Reviewed-by: Andreas
* | Port of Qt to QNXHarald Fernengel2009-07-292-9/+49
| | | | | | | | | | | | | | | | This makes Qt work on QNX 6.4. * no q3support, no phonon * no QSharedMemory, no QSystemSemaphore, no QProcess Reviewed-By: Robert Griebl
* | Port of Qt to VxWorksRobert Griebl2009-07-294-19/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Qt work on VxWorks 6.6+ in native (kernel) mode. * compiles with the WindRiver GNU toolchain (Linux only) * works with QWS (tested with the VNC driver only) * tested on PPC hardware and the x86 VxWorks simulator * no q3support, no phonon, no webkit * no QSharedMemory, no QSystemSemaphore, no QProcess * only one QApplication instance (flat address space) * filesystem support depends heavily on the quality of the native driver * QLibrary is just a dummy to make plugins work at all * qmake transparently creates VxWorks munching rules for static ctors * made auto-test cope with missing OS features A special note regarding the Q_FOREACH patch for dcc: when calling foreach(a,c) with c being a function returning a container, the compiler would generate 5 references to some labels (.LXXXX), which are not there (so the linker complains in the end). Seems like dcc doesn't really like the 'true ? 0 : <function call to get type>' statement Reviewed-By: Harald Fernengel
* | Doc: Document the purpose of the QTextFormat etc enums, and add a few linksVolker Hilsheimer2009-07-281-29/+72
| | | | | | | | to respective APIs.
* | Doc: QTextLayout is the class to use in interactive text controls.Volker Hilsheimer2009-07-271-1/+1
| |
* | Doc: QTextLayout is the class to use in interactive text controls.Volker Hilsheimer2009-07-271-6/+4
| |
* | Doc: Replace links to obsolete APIs.Volker Hilsheimer2009-07-251-2/+0
| |
* | Reverted commits that changed the behavior of the keypresses with modifiers.Denis Dzyubenko2009-07-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Apparently it changes the behavior of Qt too much and also breaks the text input in some keyboard layouts (for example in German layout you need to be able to use Ctrl and Alt or AltGr modifiers to type text). Revert "Don't insert text into a text widget when a modifier is pressed." This reverts commit 099a32d121cbc80a1a234c3146f4be9b5237e7e8. Revert "Fixed the qlineedit autotest." This reverts commit 9210e8cdc83b6812d10f5f5847d05703ef2e5f7c.
* | Doc: A few cleanups, fixes and improvements.Volker Hilsheimer2009-07-191-2/+2
| |
* | Doc: add \since 4.6 for new APIsVolker Hilsheimer2009-07-192-0/+3
| |
* | fix warnings with mingwThierry Bastian2009-07-151-0/+2
| |
* | Fix warnings for mingwThierry Bastian2009-07-152-16/+16
| | | | | | | | | | did a small refactor and used QStyleHelper::uniqueName in plastique and windows styles
* | Added QTextListFormat::ListUpperRoman and QTextListFormat::ListLowerRoman ↵Nils Jeisecke2009-07-139-7/+85
| | | | | | | | | | | | | | for roman numbering of lists as supported by HTML/ODF Reviewed-by: Olivier Goffart Merge-request: 681
* | Unified common code in QSyntaxHighlighter::rehighlight() and ↵J-P Nurmi2009-07-131-17/+14
| | | | | | | | | | | | | | QSyntaxHighlighter::rehighlightBlock() Merge-request: 379 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | Added QSyntaxHighlighter::rehighlightBlock(QTextBlock)J-P Nurmi2009-07-132-0/+28
| | | | | | | | | | Merge-request: 379 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | Don't insert text into a text widget when a modifier is pressed.Denis Dzyubenko2009-07-021-1/+2
| | | | | | | | | | | | | | | | For example when an unhandled key sequence (i.e. that has now shortcut assosiated with it) like Alt-L is pressed, we shouldn't insert the 'L' text from the QKeyEvent::text() into the text widget. Reviewed-by: Thomas Zander
* | Port gui/embedded to the EINTR-safe functions.Thiago Macieira2009-07-023-9/+12
| | | | | | | | | | | | | | I think I found two file descriptor that aren't closed. One seems like a genuine leak, the other seems intentional. Reviewed-By: ossi
* | src/gui: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-014-554/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | Also - Make winPeekMessage() & winPostMessage() obsolete - FlashWindowEx, IsValidLanguageGroup functions no longer resolved dynamically (available on >= Windows 2000) - LoadIcon/LoadCursor -> LoadImage w/LR_SHARED for system icons/cursors - qsystemtrayicon_win: use Shell_NotifyIconGetRect if available (Windows 7) Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Merge branch '4.5'Thiago Macieira2009-06-241-0/+1
|\ \ | |/ | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| * Compile.Norwegian Rock Cat2009-06-231-1/+1
| | | | | | | | Mismatch in preprocessor my previous commit.
| * Recognize | as separator characterThorbjørn Lindeijer2009-06-231-0/+1
| | | | | | | | Reviewed-by: mae
* | Remove these colorspace references.Norwegian Rock Cat2009-06-241-1/+1
| | | | | | | | | | | | | | It is only used for creating the bitmap context, so there is no reason to keep it around. Reviewed-by: Morten Sørvig
* | More culling of Panther Code.Norwegian Rock Cat2009-06-231-12/+2
| | | | | | | | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-232-1/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| * Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-232-1/+3
| | | | | | | | | | | | | | | | | | | | After discussing with some of the Objective-C people I have finally got a fair number of the warnings to disappear in both 10.5 and 10.6. I also took the opportunity to remove a bunch of other warnings. Reviewed by: Morten Sørvig
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-231-5/+0
|\ \ | |/ | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| * Improve text drawing quality with CarbonSimon Hausmann2009-06-231-5/+0
| | | | | | | | | | | | | | Re-enable fractional coordinates for text output, to produce the same output as regular Carbon/ATSUI applications. Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
* | Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-181-6/+3
| | | | | | | | Reviewed-by: Samuel
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-1689-178/+178
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1689-178/+178
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-18/+18
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * Fixed a problem with disappearing borders in a QTextFrame.Trond Kjernåsen2009-06-111-18/+18
| | | | | | | | | | | | | | | | | | The border was always drawn before the background, and if there were both a border and background brush set, the background ended up being drawn ontop of the border. Task-number: 255868 Reviewed-by: Samuel
* | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-112-19/+19
| |
* | refactor of private getters for the mode i item widget classesThierry Bastian2009-06-111-6/+4
| |
* | Makes the ODF writer use one text:tab tag for each tab, per ODF spec.Thomas Zander2009-06-111-28/+23
| | | | | | | | | | | | | | | | We used tab-ref to place multiple tabs compressed into one tag just like text:s does, but thats not what the spec says. We now don't sum up tabs anymore but just simply write out one "<text:tab/>" tag per tab. Task: 249110
* | removed superflous indirection (ie. using q->..) instead of using theThierry Bastian2009-06-101-1/+1
| | | | | | | | private class member.
* | small changes in private headersThierry Bastian2009-06-093-9/+2
| |
* | small improvement/refactor to cssparserThierry Bastian2009-06-092-42/+1
| |
* | small change to reduce static data sizeThierry Bastian2009-06-091-1/+1
| |
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-082-12/+15
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * Fixed text drawing on Windows in 16 bit mode.Trond Kjernaasen2009-06-052-13/+16
| | | | | | | | | | | | | | | | | | | | | | There were several problems with antialiased text in 16 bit mode under Windows. No gamma correction was done, yet we prepared the cached glyphs for gamma correction. The mask format we rendered the glyphs into was also set to the desktop depth, which implied that information was lost and the text looked rather odd. Reviewed-by: Samuel BT: yes
* | Revert signal emission order in QTextDocument to 4.5 behaviourmae2009-06-082-3/+11
| | | | | | | | | | | | | | This is covered by the autotest tst_QTextDocument::receiveCursorPositionChangedAfterContentsChange() Reviewed-by: con
* | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-082-0/+8
| | | | | | | | | | | | | | | | Some checks where in the wrong locations, and some endifs where hard to read. Merge-request: 611 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Fixes anti-aliased text rendering on smartphones (Windows Mobile)Thomas Hartmann2009-06-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | The check for cleartype in qt_win_read_cleartype_settings() was not correct for Windows Mobile For anti-aliased text rendering we also have to use another pixel format for the native image. Task-number: 249642 Reviewed-by: mauricek
* | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't ↵David Faure2009-06-041-1/+1
| | | | | | | | | | | | | | seem fixable easily) Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>