summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Collapse)AuthorAgeFilesLines
* Change the inclusion method here to use system includes.Jason Barron2009-07-081-1/+1
| | | | | | | | | This is a workaround for a bug in the Symbian toolchain where user includes are included relative to the source file instead of to the header that actually included it. Making them system includes seems to work around the issue without introducing problems on other platforms (so far?). These particular files cause problems because they are included by modules other than QtGui such as QtOpenVG and QtSVG.
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3089-203/+188
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * 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 'qt/master-stable' into 4.6-stableJason Barron2009-06-2530-320/+354
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | 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
| * | 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>
| * | Merge branch '4.5'Denis Dzyubenko2009-06-022-9/+2
| |\ \
| * \ \ Integrate merge-request #548 into branch 'master'Norwegian Rock Cat2009-05-281-2/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Brad Hards (2): Remove duplicate qpdf_p.h include. Fix build when compiling Qt using -no-opengl configuration. Request-url: http://gitorious.org/qt/qt/merge_requests/548 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| | * | | Remove duplicate qpdf_p.h include.Brad Hards2009-05-281-2/+0
| | | | |
| * | | | oops, build was broken on embeddedThierry Bastian2009-05-281-1/+1
| |/ / /
| * | | improved string operations all over the placeThierry Bastian2009-05-286-26/+25
| | | | | | | | | | | | | | | | | | | | used character operations whenever possible better usage of QLatin1String
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-274-20/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * | | | Restore undo compression for cut/del of selectionsmae2009-05-271-25/+32
| | | | | | | | | | | | | | | | | | | | This is a small fix to 4af30f47c37fd0e6826aca2984dd0f567dc7e465
| * | | | some cleanups on private exported symbolsThierry Bastian2009-05-264-11/+7
| | | | |
| * | | | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-257-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wherever I found that we were using a string instead of a single char I fixed the code. Reviewed-by: olivier
| * | | | Merge branch '4.5'Thiago Macieira2009-05-222-15/+29
| |\ \ \ \
| * \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-192-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'origin/4.5'Olivier Goffart2009-05-181-7/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * | | | | | | Fix compilation of the cssparser testOlivier Goffart2009-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the Q_GUI_EXPORT macro have been removed, but we still need to export the classes for the test
| * | | | | | | Merge branch '4.5'Thiago Macieira2009-05-141-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * \ \ \ \ \ \ \ Merge commit 'origin/4.5'Olivier Goffart2009-05-131-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | compilation fix for LinuxThierry Bastian2009-05-111-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch '4.5'Thiago Macieira2009-05-111-1/+6
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Almost 200 symbols that didn't need to be exported.Thierry Bastian2009-05-111-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch '4.5'Thiago Macieira2009-05-112-21/+38
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | removing additional unused export to classes only used in QtGuiThierry Bastian2009-05-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ogoffart
| * | | | | | | | | | | Do not export inline private classes in qcssparser_p.hThierry Bastian2009-05-081-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ogoffart