summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Avoid double initialize of platform font databaseJiang Jiang2011-11-081-1/+0
| | | | | | | | | | | Since platform font database will be populated in QFontDatabase::load, no need to do it here in QFont::initialize. The change was in cd781b732ed29b41b5ac18e39cbbba2815fc8f8b but lost in previous merge. Change-Id: Iaa56fea5765d94e4f7b58409654bc218808086cd Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* QPainterPath: Fix copy constructor again.Charles Yin2011-11-081-1/+1
| | | | | | | | | | | | The previous fix a05270f435483937e76d18fa6e512dc0394507d1 is not correct, QPainterPathPrivate(other) should be QPainterPathPrivate(), as there is only a default ctor for QPainterPathPrivate and ref is initialized there, use copy ctor just copies the ref value which makes all detach() calls broken. Add an unit test for this as well. Change-Id: I658f0a977664d5ec523af3f8a48c1a866eda6ab0 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix subpixel positioning supportJiang Jiang2011-11-088-41/+26
| | | | | | | | | | | | Move subpixelPositionForX from QTextureGlyphCache to QFontEngine, since some font engines like QFontEngineFT may need a custom implementation or tweak it a little bit. In QRasterPaintEngine::drawCachedGlyphs, do not add aliasedCoodinate to x offset as that will break subpixel positioning. Change-Id: Idbcec617509459b80965220ceb07b17737649bbf Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Implement QRegion::isNullJędrzej Nowacki2011-11-082-0/+16
| | | | | | | | The method was missing from QVariant perspective (QVariant::isNull supposed to call isNull not isEmpty). Change-Id: Ic1ac9f662e275ac73908809f2c4ac59679b40b00 Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* QPainterPath: Fix copy constructor.Friedemann Kleint2011-11-071-1/+1
| | | | | | | | | | Re-add base class initialization accidentally removed by e277575987657aa07444eea9bee99769f039d3b0. Fix warning: 'base class 'class QPainterPathPrivate' should be explicitly initialized in the copy constructor. Change-Id: Ie94fa82eeeb3a8ddc69aef447f73ce36da616916 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fix QQuickTextInput implicit width.Andrew den Exter2011-11-071-1/+2
| | | | | | | | | | QQuickTextInput tries to set the UseDesignMetrics text option on its QLineControl but this is overridden by the options set in updateDisplayText(). Apply the new options in updateDisplayText to the existing options. Change-Id: I6789c3c2d6e496c1594d586bd075473983978f77 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Support tentative commit string with input method.Pekka Vuorela2011-11-052-0/+22
| | | | | | | | | Tentative commit string allows input method to notify editor what is expected to be committed in the place of preedit. This commit adds such support in QLineEdit. Change-Id: If855619bc6843652db0d6254f7e7063bb8ad0936 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Allow disabling FreeType internal cacheJiang Jiang2011-11-052-155/+112
| | | | | | | To disable it, set QT_NO_FT_CACHE environment variable to 1. Change-Id: I086aa93c71cbdf86858a41a2bbad5d2db247cdfb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix a warning in QGlyphRun compilationJiang Jiang2011-11-051-0/+1
| | | | | Change-Id: Ic072240193fc8eb5e7fdcd0dada79383398b224b Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Restore subpixel rendering support with fontconfig and FreeTypeJiang Jiang2011-11-051-1/+2
| | | | | Change-Id: I45cf83374ba5a8b1ae88415950c1e5ab72991598 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Improve QtGui start-up time and memory use.Samuel Rødal2011-11-043-61/+98
| | | | | | | | The gamma lookup tables can be allocated and computed on demand, as they're not always needed, depending on the platform and the use case. Change-Id: I2d4c2860746366a0e46edb53bd4ecd2778de2464 Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* Do not put cursor at non-stop character positionsJiang Jiang2011-11-041-0/+3
| | | | | | | | | | | When moving cursors, non-stop positions are skipped, however certain input sequences can still lead us there. In such cases we should simply ignore those positions in cursorToX. Task-number: QTBUG-7076 Change-Id: Ia0a25931f4043359f72a6c0c14a74b905e40b93e Reviewed-by: Eskil Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Release font engine refcount when done using it in QTextEngineJiang Jiang2011-11-043-5/+12
| | | | | | | | | | | | | 5f2b6dd2a50275bc05ae5d7e9dd8902d6d49d9df increased refcounts for font engines in QTextEngine cache, we need to decrease them when the QTextEngine is deallocated. Task-number: QTBUG-21222 Reviewed-by: Eskil (cherry picked from commit 8935a84e18804c7ff4b7336e3cfdf1cd558eaf1c) Change-Id: I079c903d60e1bbcf78f555f8044dde69af82cf0e Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* QtGui: Fix compilation with gcc 4.4Friedemann Kleint2011-11-032-28/+77
| | | | | | | | | | | | - Do not mix QStringLiteral and Q_TR_NOOP. - Replace static QString member variables by - static member functions to return the strings. - Use tr() since QAccessibleActionInterface declares it. Acked-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> Change-Id: Iabbee8ef61a5d7bfd35978a3f1cce1866329d065 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Renamed QTextLayout member variable for readabilityPekka Vuorela2011-11-032-39/+39
| | | | | | | | | Class complex enough already without int i as member variable. Furthermore, some methods use loop variable with same name, shadowing the member one. Change-Id: Idf2f5e34f130a60eb6121480e596e443f23641dd Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Documented side-effect of QTextLayout::setPreeditArea()Pekka Vuorela2011-11-031-1/+2
| | | | | | | Invalidates layout and requires layouting again. Change-Id: I1cb954f155e4fc1df4b217478998ac903cc18323 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Add Q_PROPERTY declarations to QScreen.Samuel Rødal2011-11-012-19/+62
| | | | | | | | This means we can expose the API to QML in a simple way. Change-Id: Ibc36711071d288ed78ce833a64d6be2f22fc4b62 Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Revert "Fix use of qMax() with floating point constants"Sergio Ahumada2011-11-011-2/+2
| | | | | | | This reverts commit 4e1b8720c1498edbb7a5bd37f622fdd3feb07850 Change-Id: I5e52a86119b522888b69fa261ebfa9168f885864 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Remove declaration of QRasterPlatformPixmap::fromFile()Bradley T. Hughes2011-10-311-1/+0
| | | | | | | | | | | | | | | | | | | | | This function is not implemented, and the declaration hides the virtual QPlatformPixtmap::fromFile(): ../../include/QtGui/5.0.0/QtGui/private/../../../../../src/gui/image/qpixmap_raster_p.h:70:10: warning: 'QRasterPlatformPixmap::fromFile' hides overloaded virtual function [-Woverloaded-virtual] void fromFile(const QString &filename, Qt::ImageConversionFlags flags); ^ ../../include/QtGui/../../src/gui/image/qplatformpixmap_qpa.h:90:18: note: hidden overloaded virtual function 'QPlatformPixmap::fromFile' declared here virtual bool fromFile(const QString &filename, const char *format, ^ Change-Id: Iedbc4acd9f9218f8fe72a44a9eff6a35b5494d75 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Re-added hellogl_es and ES 1 support for QOpenGLContext.Samuel Rødal2011-10-311-2/+6
| | | | | Change-Id: I576cf3595cdeeefb4ed840bb3b2b7097b3609cc7 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Add missing include when enabling deprecated codeOlivier Goffart2011-10-311-0/+4
| | | | | | | | QStringList is used by the inline code. (I did not see that before because I was using precompiled headers) Change-Id: Ieea4f13c143495f841b5246d835b584cc7404ac6 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Gui/OpenGL: Remove remains of qpa from profiles.Friedemann Kleint2011-10-312-70/+47
| | | | | Change-Id: Iff2531a19030bd782ee4cd9bbe529d18666503f9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix most warnings about assignments of QAtomicInt.Friedemann Kleint2011-10-318-13/+11
| | | | | Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fix use of qMax() with floating point constantsSergio Ahumada2011-10-301-2/+2
| | | | | | | | When passing floating point constants make sure to cast them as qreal's. Change-Id: I17e7ee407ac4f92ce947f6a384aa4d64edb8e983 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove S60/symbian specific codeLars Knoll2011-10-291-331/+0
| | | | | | | | Clean up and remove Symbian specific code and data. Change-Id: I89976fd087d485e04d37eccd3aeb3d2beac59b0a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove Windows and X11 from src/widgets/platforms.Robin Burchell2011-10-286-653/+1
| | | | | | | | | | This is dead code, unused with QPA in place, so remove it to avoid confusion caused through grepping for class names existing in both old and new places. Mac code is left in place for now, as some of it is still in use. Change-Id: Ia82cd5bbabe71285ca997f79d8fd9c0504e32c28 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Get rid of legacy glTexParameterf calls.Samuel Rødal2011-10-283-25/+18
| | | | | | | | | | | ES 1.0 didn't have glTexParameteri, which is why we sometimes used glTexParameterf. However, we shouldn't use glTexParameterf because that's treating integer values as floating point, which is not type safe. ES 1.1+ and ES 2.x have glTexParameteri, and we don't really care about supporting ES 1.0 in any case in Qt 5. Change-Id: I6b586b31ddc418ba319c4cc88f6bb3978fdbd040 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Freetype: Do not unlock face when returning superclass value in ↵Oliver Wolff2011-10-281-1/+0
| | | | | | | | | | lockedAlphaMapForGlyph If the face is unlocked in this case, calling unlockAlphaMapForGlyph after doing the operation will cause an assert. Change-Id: Icb2310a3b139e5bedf24f9c3794bd7d3fd38cfea Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Replace implicit QAtomic* casts with explicit load()/store()Bradley T. Hughes2011-10-2722-71/+68
| | | | | Change-Id: Ia7ef1a8e01001f203e409c710c977d6f4686342e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compiler warnings.Friedemann Kleint2011-10-275-12/+12
| | | | | | | | - Fix gcc 4.6.X warnings about assigned but unused variables - Remove trailing ';' from inline functions (Clang) Change-Id: I8670afd6b149748a740f22c65de137762e9f18e1 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fixed crash in printsupport on WindowsOliver Wolff2011-10-271-8/+1
| | | | | Change-Id: I3fec51b9f5c55296041b79bbf6da9d7687ae9afd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Compile with QT_ENABLE_DEPRECATED_BEFORE set to old version of QtOlivier Goffart2011-10-272-13/+12
| | | | | Change-Id: Ice67071cc97ad645a7dda264a3dce184fceae75a Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Do not call setCursor on Desktop or if there is no platform window.Friedemann Kleint2011-10-271-4/+10
| | | | | | | Fix a crash on Windows. Change-Id: I2b88e113d7149444ebc8946c0ee0eba7a9b5bbc2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add default actions to QAccessibleWidget.Frederik Gladhorn2011-10-272-23/+10
| | | | | Change-Id: I9f251aad663fd0b8db2ef068c6581241d91c090d Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Native file dialog support for MacMorten Sorvig2011-10-272-0/+16
| | | | | | | | | | * New API: QPlatformDialogHelper to support native dialog on QPA. (Currently, It supports only file dialog.) * Modify QDialog* and QFileDialog* to support native dialog. * Add native file dialog support to cocoa platform plugin. Change-Id: I957f046748a27a33fd9f8af3c525feabd1b0f582 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix spellingMorten Sorvig2011-10-261-2/+2
| | | | | Change-Id: If9630ffa3a1c411b2e56b41ed35c272177343274 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* QtGui: Remove Q_WS and qpa.Friedemann Kleint2011-10-2515-279/+28
| | | | | | | | | Enable compilation without -qpa. Remove QT_NO_FREETYPE and QT_NO_FONTCONFIG when building. Change-Id: I0e017cc47ee06b885be65deaeb67a449a119b8be Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Sanitize QAccessible includes.Frederik Gladhorn2011-10-254-5/+5
| | | | | Change-Id: I86f5ae75293e5e4d370363d84402f4e7fad03a9e Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Improve drawing scaled image with raster using SSE2Olivier Goffart2011-10-243-22/+153
| | | | | | | | | | | | | | That codepath is taken in qml when an Image specify with and hight and is not smooth, and the image contains alpha contents The changes in qdrawingprimitive_sse2_p.h just put some code from the BLEND_SOURCE_OVER_ARGB32_SSE2 macro into a sub macro to allow its reuse The code that is not SSE2 in qt_scale_image_argb32_on_argb32_sse2 comes from the qt_scale_image_argb32_on_argb32 in qblendfunctions.cpp Change-Id: I071a040af4514fb21777dead9f7c5baf16071d59 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Keep Multi font engine in QFontCacheJiang Jiang2011-10-243-7/+16
| | | | | | | | | | | | | If we only keep single QFontEngineFT in QFontCache, then when we are looking for the MultiQPA next time with the same QFontDef, the FT engine will be returned and we get no font fallback support. That's why we need to keep the Multi engines in QFontCache as well and distinguish them from the single item. Since QPA doesn't use 'screen' field of QFontCache::Key structure, we use it here to indicate that we are caching a multi font engine. Change-Id: Id899d5c5ba52f4bccf134bcd6b1c6386ba22063c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Multiline editors not to limit anchor position inputMethodQueryPekka Vuorela2011-10-241-1/+1
| | | | | | | | | | | | The queries were limited to current block, because that is the available surrounding text. Input method side, however, cannot then distinguish between anchor being really at start or end of the surrounding text, or beyond it. Without the limitation there at least is a way to know anchor is at unknown territory. Change-Id: I388d33566388344ec816ea7d86662b7e36a3d7d0 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Deprecate QDesktopServices::storageLocation/displayNameDavid Faure2011-10-232-13/+17
| | | | | | | Which required porting the related unittests to qstandardpaths Change-Id: I6eb63c46845f05cd29cc42b59872707526277c90 Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
* Rename storageLocation() to writableLocation().David Faure2011-10-231-2/+2
| | | | | Change-Id: I8f6522a70950f78ddd6141360d36d104bd697e28 Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
* Move path information from QDesktopServices (gui) to QStandardPaths (core)David Faure2011-10-236-435/+13
| | | | | Change-Id: Ic596c21894d83b4dab0c3f5b1aed916ddd590f2f Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
* QWindow: Re-create platform window only if screen actually changes.Friedemann Kleint2011-10-221-6/+10
| | | | | Change-Id: I3b7dd8b1307aa3cc9357dca861ea407644c5a2e9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add virtual QWindow::focusObject() methodLars Knoll2011-10-222-0/+10
| | | | | | | | | | The method allows to retrieve the object that currently has the input focus inside the Window. This is e.g. required to correctly determine the context for keyboard shortcuts. Change-Id: I9e05ef62717973bac275ce34cc70fb86aa2d1e5b Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix two typos: docu for "deprecated since" and Q_DEPR... -> QT_DEPR...David Faure2011-10-221-1/+1
| | | | | | | | Shows that there should be an automated build with QT_DISABLE_DEPRECATED_BEFORE set to 0, too... Change-Id: If154786ea26bcbfab41efcd7001c222cc258a8af Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* [blitter] Work on tst_QPixmap::clear()Holger Hans Peter Freyther2011-10-212-3/+15
| | | | | | | | | | | | | | | | | | | By default QPixmap may not hasAlphaChannel(), only if setMask() or fill() with a transparent color is called a QPixmap will hasAlphaChannel(). Make the QBlittablePlatformPixmap remember if there is an alpha channel, pass this as parameter in createBlittable to make it clear that this is required and not optional. Update the DirectFB plugin to handle this parameter to create a RGB32 or ARGB Surface depending on the alpha value, also only use PreMultiplied alpha when using ARGB. Separate the two constructors for the QDirectFbBlitter to either adopt a DirectFB Surface or to create one. Change-Id: I8abf82408ecd2d075fc6f241ace8be2a34ac56e7 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* [blitter] Generate a new serial number when resizing the pixmapHolger Hans Peter Freyther2011-10-211-0/+1
| | | | | | | | The raster pixmap is generating a new serial number when the pixmap is resized, do the same for the blitter code. Change-Id: I05c74df7ea0f3a99ec9c24dacb41562da21c2d6d Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix compiler warnings when using QT_DEPRECATEDSergio Ahumada2011-10-211-0/+2
| | | | | Change-Id: If62cff5d1cbd1c8051d709db8747777606797056 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 00:18:30 +0000