summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Fix compiler warnings.Friedemann Kleint2011-09-282-0/+3
| | | | | | | Change-Id: I6b6d86097074a12c9c4e3d22fe61a6b962ffa21e Reviewed-on: http://codereview.qt-project.org/5627 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Don't crash if qApp->overrideCursor() is 0Lars Knoll2011-09-281-3/+2
| | | | | | | Change-Id: I9e61be7ed537a988ce8ccca20f672f5c66275452 Reviewed-on: http://codereview.qt-project.org/5561 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Use the drag cursor shapesLars Knoll2011-09-281-12/+13
| | | | | | | | | | | Correctly use the Qt::Drag* cursor shapes for drags. Still doesn't work as QGuiApp::setOverrideCursor needs an implementation. Change-Id: I60b6a647be03f3700408ee8afcfa631a18e2bcaf Reviewed-on: http://codereview.qt-project.org/5559 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Update QLineControl's state correctly with QT_NO_ACCESSIBLITY.Andrew den Exter2011-09-271-2/+2
| | | | | | | | | | | Always call finishChange in setText, not just when QT_NO_ACCESSIBILITY is undefined, otherwise lots of things don't get updated. Task-number: QTBUG-21686 Change-Id: I58b320814fb379b462e39b7e675fe6e9fc41ba8a Reviewed-on: http://codereview.qt-project.org/5594 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Oops, adding Q_EXPORT to QPlatformScreenPageFlipperPaul Olav Tvete2011-09-271-1/+1
| | | | | | | Change-Id: I6bda579734c77201f52107db988b9a2eefefb327 Reviewed-on: http://codereview.qt-project.org/5525 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed crash in QOpenGLFramebufferObject.Samuel Rødal2011-09-271-3/+0
| | | | | | | | | | AMD's Catalyst driver returns true in glIsRenderbuffer() for a newly gen'ed render buffer. Change-Id: I177425dc4b94923431cec5f89175c63782819eef Reviewed-on: http://codereview.qt-project.org/5522 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix possible assert in QFontEngineFTEskil Abrahamsen Blomfeldt2011-09-261-1/+3
| | | | | | | | | | | This is a regression caused by 070d9c00. If the defaultFormat is set to Format_None, we should default to Format_A8 like before the change. Change-Id: I8ad07abff96fc1dfa03c0c5b49d13beb36b9de70 Reviewed-on: http://codereview.qt-project.org/5540 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Add some enablers to QTextDocumentLayoutEskil Abrahamsen Blomfeldt2011-09-262-1/+43
| | | | | | | | | | | | | | | | Required to access internals used in the layout process, so that we can present the layout in the scenegraph. For instance, the frameBoundingRect() for tables will be the internal bounding rect of the cells. To avoid regressions, I've added a separate function for the outer bounding rect. For now, this is private API, but if it turns out to be useful, the functions can easily be added as virtual to QAbstractTextDocumentLayout. Task-number: QTBUG-20917 Change-Id: I04e07d3850b21f9f0704bf8c8a3ffe97ee5c3fda Reviewed-on: http://codereview.qt-project.org/5539 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix possible crash in QFontEngineFTEskil Abrahamsen Blomfeldt2011-09-261-1/+1
| | | | | | | | | | | | | Avoid crash if set pointer is null. Task-number: QTBUG-21647 Reviewed-by: Jiang Jiang (cherry picked from commit e05734987594f0e54f58a2ab3037cdf4956e9036) Change-Id: I49fde194ef6be5485a43c5d09fc43170ab9d4d6b Reviewed-on: http://codereview.qt-project.org/5532 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Make QVectorData::shared_null constBradley T. Hughes2011-09-261-1/+2
| | | | | | | | | | | | | Similar to QByteArray and QString, keep the shared_null in shareable memory and never modify it. Since QRegion uses the internals of QVector, we need to make sure that QRegion also never modifies the shared_null. Change-Id: I809e5873fe414138f97d501e05458b73c04b18fb Reviewed-on: http://codereview.qt-project.org/4529 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Doc: Fixed \since declarations.David Boddie2011-09-261-2/+2
| | | | | | | | | | (cherry picked from commit 358e018dbb4b4dbdbfc702a6d462f113a1357e1e) (cherry picked from commit 16355187f69d4431b79b05201b36729c8e5102fe) Change-Id: Idb18570df01c7463e0dc0f78fd05f80372afa64f Reviewed-on: http://codereview.qt-project.org/1983 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* Make sure cursor position doesn't exceed line endJiang Jiang2011-09-231-0/+3
| | | | | | | | | | | | | | If we have trailing spaces at the end of a line, cursor will disappear because the position we returned exceeds line end, thus the widget border. By limiting it within line.width we can make sure it always visible, which is more consistent to the behavior in common platforms. Reviewed-by: Eskil (cherry picked from commit c750afe0e0f043389d30850070889946e4c6e8af) Change-Id: Ifc60b718369639bbb6f5afb35c29a6eb0dccd219 Reviewed-on: http://codereview.qt-project.org/5458 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Implemented QWidget's move() vs setGeometry() distinction in QWindow.Samuel Rødal2011-09-233-5/+81
| | | | | | | | | | | | | | QWidget's move() sets the position of the window including the window frame, unlike setGeometry(). There was no equivalent for this in QWindow, so several QWidget auto-tests were failing. Now we add setFramePos() to achieve the same purpose in QWindow. This fixes tst_QWidget::windowState(), which uses move(). Change-Id: I9a3e558bd615a8f0234cc3dd94fbb2bf5ecbc148 Reviewed-on: http://codereview.qt-project.org/5405 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed geometry issues.Samuel Rødal2011-09-234-5/+16
| | | | | | | | | | | We need to compare against the window's currently known geometry to know when to send resize and move events. Also make sure at least one resize event is sent, instead of sending one before each expose. Change-Id: Id7ebe4c1c0e723af9198c668a0c736d64efdbf3e Reviewed-on: http://codereview.qt-project.org/5364 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add autotest for QInputPanelJoona Petrell2011-09-232-9/+24
| | | | | | | Change-Id: I8ac28d93f610cd3eb69087d2c961a5aab6c47e1e Reviewed-on: http://codereview.qt-project.org/5394 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Support adding application fonts with QFontconfigDatabaseJiang Jiang2011-09-236-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFontDatabaseQPA should be able to reinitialize database and reregister all the fonts when an application font is added, because it will trigger db->invalidate(). Add cloneWithSize support to QFontEngineBox so that even no usable font is found in QFontDatabase, QRawFont::setPixelSize can still work (without making the result rawfont invalid). Register application fonts with QFontconfigDatabase, the code is adapted from QFontDatabaseX11. Reenable QRawFont tests for QPA, these usages are now supported in QPA. Fix QStaticText tests, raster in QPA does support transformations. Translate the text before ZAxix rotation so that it will be visible in canvas. Add back fixedPitch support to QPA, and fix QFontDatabase tests. Fix QGlyphRun tests, ignore non-existence glyphs in alphaMap locking. Fix QFontMetrics tests. Task-number: QTBUG-21415, QTBUG-20754, QTBUG-20977, QTBUG-20976, QTBUG-20760, QTBUG-20759 Change-Id: I24aea7d6ec6b2ac6342134d1f2591327c23a692b Reviewed-on: http://codereview.qt-project.org/5384 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Avoid crash in handleTouchEvent and remove superfluous mapping.Laszlo Agocs2011-09-231-8/+2
| | | | | | | | | | | | | | | | | | | 252d1b34b26779cbc1ac269f4af7fdb1f27038ef introduces a mapFromGlobal call in QWindowSystemInterface::handleTouchEvent. This has two issues: It ignores the fact that the tlw parameter can be null, resulting in an instant crash with the touch support of some platforms, and the mapping itself is unneccessary because QGuiApplication::processTouchEvent() will perform the same, the rect set via setRect() is basically ignored due to the touchPoint.d.rect = ... just before sending the final event to the widget in qguiapplication.cpp. Using setScreenRect instead of setRect is a valid fix from the previous patch, but the parts for the mapping need to be removed. Change-Id: I0bb40c7d647fb062106b151e5987f9970d6ab2c8 Reviewed-on: http://codereview.qt-project.org/5448 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
* Page flipping API for QPlatformScreenPaul Olav Tvete2011-09-232-0/+51
| | | | | | | | | | | Adding a page flipping API for platform plugins. This enables Wayland compositors to show full-screen client windows directly without copying any data - if supported by the platform. Change-Id: I19abe366434140f9e20a0655fe7cd41ea9264fca Reviewed-on: http://codereview.qt-project.org/5385 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Allocate 16-byte aligned memory independent of platform for raster pool.Samuel Rødal2011-09-221-37/+17
| | | | | | | | | | | | | Fixes crash on MIPS (see original merge request https://qt.gitorious.org/qt/qt/merge_requests/1366). Reviewed-by: Olivier Goffart (cherry picked from commit 786b85b13bc884a8b7eab59c43d6c393863fc470) Change-Id: Ia7731d3d670c0c4dccab861e5085b03a6bf6f4f0 Reviewed-on: http://codereview.qt-project.org/4562 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Export QTextImageHandler and add accessor for imageEskil Abrahamsen Blomfeldt2011-09-212-3/+11
| | | | | | | | | | | | | To allow optimizations in the scene graph, we export the private QTextImageHandler class and add a function which will fetch a given image when required, or return the cached image in the document resources. Task-number: QTBUG-20917 Change-Id: If45e51b0d9a267bc198623165e7a2cc1fb2b961f Reviewed-on: http://codereview.qt-project.org/5227 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix support for drag pixmapsLars Knoll2011-09-212-53/+57
| | | | | | | | | | | Re-add the support for drag pixmaps to qdnd. Use the new WindowTransparentForMouseEvents flag for the window that shows the drag pixmap. Change-Id: I4b594085c161475988b9be0ffdc02c75fcc37f66 Reviewed-on: http://codereview.qt-project.org/5261 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Return the correct geometryLars Knoll2011-09-211-0/+2
| | | | | | | | | | | | | When the platform window is created, it is the authorative source for geometry information. It would however be better if we could completely avoid duplicated places for the geometry data. Change-Id: Id90b24b9c40acb57f3d11b8b927292c06bac335e Reviewed-on: http://codereview.qt-project.org/5258 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Implemented key filter support on platform input contextPekka Vuorela2011-09-202-1/+6
| | | | | | | | | | | As previously with QInputContext, now supporting filterEvent() interface. Usage only on XCB so far. Change-Id: I8e5972626552bda32318fe060017d0217bb79a94 Reviewed-on: http://codereview.qt-project.org/5240 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QWindowSystemInterface: Fix wrong mapping of coordinates.Bjørn Erik Nilsen2011-09-201-2/+14
| | | | | | | | | | | | | QTouchEvent::TouchPoint assumes the rect() is in local coordinates, whereas QWindowSystemInterface::TouchPoint uses screen coordinates. We must therefore use QWindowSystemInterface::TouchPoint::area as the screenRect() rather that the rect() and then use the screen coordinate to calculate the local coordinate by using mapFromGlobal. Change-Id: If7a52f5668c3938f46bdd38a5ea82b5313d6b626 Reviewed-on: http://codereview.qt-project.org/5253 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
* [blitter] Fix memory leak in the blitter paintengineHolger Hans Peter Freyther2011-09-201-5/+5
| | | | | | | | | | | The raster engine and the capabilities were leaked, use the QScopedPointer to prevent that from happening. Change-Id: I31ba0117280b48ad942fbb638fb151ccb7b34385 Merge-request: 59 Reviewed-on: http://codereview.qt-project.org/5242 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* [blitter] Use QScopedPointer for the engine and blittableHolger Hans Peter Freyther2011-09-202-15/+10
| | | | | | | | | | | Use the QScopedPointer to prevent memory leaks, right now the code appears to be sound but make it more clear that calling ::setBlittable will destroy the old one. Change-Id: Idc71add7cfd429ff5b9d0ea9908d9fff1e7ce74d Merge-request: 59 Reviewed-on: http://codereview.qt-project.org/5243 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFTAleksandar Stojiljkovic2011-09-201-2/+6
| | | | | | | | | | | Task-number: QTBUG-21162 - Letters get truncated when font size=72 and set to Italic Reviewed-by: Eskil (cherry picked from commit cd43d6386de6e66379fa23c1ea4ec06141167c86) Change-Id: Ic05f775975d5f21e0274e7b2c3a4903d6a4ae41f Reviewed-on: http://codereview.qt-project.org/5203 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Generate glyphs in un-transformed coordinate system.Samuel Rødal2011-09-201-3/+4
| | | | | | | | | | | | | | Avoids rounding issues with very large coordinates. Task-number: QTBUG-21262 - QRasterPaintEngine & QFontEngineFT - fonts corrupted when scrolling to the bottom of long texts Reviewed-by: Eskil Signed-off-by: Aleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com> (cherry picked from commit 43e013e2048e8193e2d31276cac6348a9f6ce340) Change-Id: I5810a1a60f2bbdba4889a6b5e493b183018f3976 Reviewed-on: http://codereview.qt-project.org/5202 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Avoid double caching glyphs in raster/QPA/FreeTypeEskil Abrahamsen Blomfeldt2011-09-207-119/+181
| | | | | | | | | | | | | | | | | | | | | Since FreeType has internal caching, it has had a special code path in the raster engine which avoided using Qt's glyph cache, as that would be redundant. However, when compiling with QPA, we want the same behavior without being able to access the QFontEngineFT class. To achieve this, I've made a new abstraction and added it to QFontEngine which allows the FT engine to provide direct pointers into the alpha maps stored by FT. This requires a locking/unlocking mechanism. Yes, the QFontEngine::alphaMap* API is slowly becoming a horrible mess, but due to time constraints, the task of refactoring these functions into a more flexible API needs to wait. I've added a TODO comment for this. Change-Id: I08237403c2967f8fb952258178676f33a87c0353 Reviewed-on: http://codereview.qt-project.org/5155 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix regression causing synthesized oblique glyphs to clipEskil Abrahamsen Blomfeldt2011-09-191-1/+15
| | | | | | | | | | | | | | | | | In 20009ed797fb30952a889df5716aa2399102be58 I introduced a new approach to synthesized oblique. However, while the embolden function in FT alters the glyph metrics accordingly, the oblique function does not, so the glyphs would be clipped to the original, unslanted metrics. So I've implemented the same matrix in the loadGlyph() function and we now apply this to the metrics manually. This will only work as long as the underlying algorithm doesn't change significantly. Task-number: QTBUG-21202 Change-Id: Ic20b2a0fdeac5ce833e95fd06efa12b3b70feee5 Reviewed-on: http://codereview.qt-project.org/5156 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Move handling of -qmljsdebugger argument to QCoreApplicationKai Koehne2011-09-191-2/+0
| | | | | | | | | | | | Move handling of -qmljsdebugger= argument from QApplication to QCoreApplication. It makes sense to allow debugging also for applications based on QCoreApplication (which we intend to support in QtDeclarative). Change-Id: I5a03a4510fc166cea5aad146da673ee0e7cd5d36 Reviewed-on: http://codereview.qt-project.org/5121 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Say hello to QWindow::accessibleRoot()Jan-Arve Saether2011-09-192-0/+12
| | | | | | | Change-Id: I1efa71f01f8af46c9addf2aae21e4b6fc086ad2e Reviewed-on: http://codereview.qt-project.org/5087 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Support synthesized oblique and bold in SceneGraphEskil Abrahamsen Blomfeldt2011-09-192-3/+21
| | | | | | | | | | | | | | | When fetching the outlines we need to synthesize the weight and style of the requested font. This is currently only supported on FreeType versions that have the Embolden and Oblique functions. We also use FreeType's Oblique function for regular text when possible, and only use the matrix approach when that function is unavailable. Task-number: QTBUG-21202 Change-Id: I0656ab66cc3ec70d6a7675b8c78d06632625261c Reviewed-on: http://codereview.qt-project.org/5076 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Enable glyph caching on QPAEskil Abrahamsen Blomfeldt2011-09-191-31/+3
| | | | | | | | | | | | The glyph caching was disabled on QPA, possibly due to some bugs which have gone away now. To avoid the performance hit of this, we need to enable it. Simple tests of QTextEdit indicate that this works fine. Change-Id: I40845b327331b366161f1ca55bf00853bca87358 Reviewed-on: http://codereview.qt-project.org/5096 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Treat QTestFontEngine properlyJiang Jiang2011-09-191-1/+1
| | | | | | | | | | Do not try to fill fontDef when it's a test font engine, otherwise it will cause a crash because desc.family is 0. Change-Id: I008b784bae3e60a25c33c285d944442a3616a9a2 Reviewed-on: http://codereview.qt-project.org/5103 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix trailing spaces problem by not adding it to QScriptLine.lengthJiang Jiang2011-09-173-5/+7
| | | | | | | | | | | | | | | | | | | | | | It seems to be the only sane way to fix it. Previous attempts to fix it by compensating the trailing space width all failed in some cases, one of the trickiest is when we are having embedded LTR text that has trailing spaces in a RTL paragraph. In this patch we leave line.length not including the trailing space length, but saving it to a separated variable, so that we can always add it back when needed (QTextLine::textLength() for instance). It fixed all the problems in different alignments of both RTL and LTR text. And no regression is found yet. Reviewed-by: Eskil (cherry picked from commit 80294c375eca9687d1c34e9ab048294373e7f00c) Change-Id: Id248ab6f54f8cc25ba0e9d1626703463dfefbcea Reviewed-on: http://codereview.qt-project.org/4778 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docsEskil Abrahamsen Blomfeldt2011-09-151-1/+2
| | | | | | | | | | | | | There's no QImage::Format_A8 format. This is a term used in the corresponding QFontEngineGlyphCache enum. Reviewed-by: Jiang Jiang (cherry picked from commit e453fce2731069dce993a94b0c2291307cc7806c) Change-Id: I68a190abdf4446d05231af89ac861380ac79b188 Reviewed-on: http://codereview.qt-project.org/4773 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Properly register preedit text in QLineControlEskil Abrahamsen Blomfeldt2011-09-151-1/+0
| | | | | | | | | | | | | Removes the QT_NO_IM macro which was a temporary measure during refactoring work. This macro disabled the setPreeditArea() call and caused only the formats of the preedit text to be registered, not the actual string. Task-number: QTBUG-21261 Change-Id: I76cdf116043520fa2185ddcd34739da031c0fcdc Reviewed-on: http://codereview.qt-project.org/4958 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* compile when shadowing is an errorGunnar Sletta2011-09-151-3/+3
| | | | | | | Change-Id: If12cd19821d07303e808e19be1ee3984c90110b1 Reviewed-on: http://codereview.qt-project.org/4946 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix missing/incorrect license headersJason McDonald2011-09-151-0/+40
| | | | | | | Change-Id: I9db33c63c951f288f7a106c3008771699662d104 Reviewed-on: http://codereview.qt-project.org/4852 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix stale license headers from refactor branchJason McDonald2011-09-1517-290/+290
| | | | | | Change-Id: I38cd941202641f50bf632af35165a944d03a20e3 Reviewed-on: http://codereview.qt-project.org/4848 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add new composite Qt::ImQueryInput queryJoona Petrell2011-09-141-1/+1
| | | | | | | | | | | | | | | | When cursor position or editor text changes many input method query attributes like cursor rectangle, cursor position, surrounding text, current selection and anchor position change as well. Checking in text control and editor classes what of those related attributes have exactly changed before calling the update increases code complexity unnecessarily for a little benefit. Qt::InputMethodQueries flag can still be used to optimize more independent cases when attributes change individually, which is more common for input methods hints, fonts, platform data, maximum length or enabled attributes. Change-Id: Ic9eee5f1edb6d33ef6c01d2c9c8ad582100c0150 Reviewed-on: http://codereview.qt-project.org/4739 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Merge branch 'refactor'Gunnar Sletta2011-09-131371-582378/+33441
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
| * Implemented texture cache for GL paint engine in QtGui.Samuel Rødal2011-09-127-118/+342
| | | | | | | | | | | | | | | | | | | | | | This is simpler than the existing texture cache in QtOpenGL, as it only serves the GL paint engine. There's one per context group, to simplify the design and to prevent performance degradations. Change-Id: I61e3c9a444d8e246a8b38da019a56f2c0a533c0c Reviewed-on: http://codereview.qt-project.org/4674 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * Fixed auto-test failure in tst_QOpenGL.Samuel Rødal2011-09-121-1/+1
| | | | | | | | | | | | | | | | | | QOpenGLFramebufferObject::height() was returning the width... Change-Id: I521c2df02e00015998dc31a74481113af26e1ba6 Reviewed-on: http://codereview.qt-project.org/4663 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Compile fix for QPAHolger Ihrig2011-09-122-0/+2
| | | | | | | | | | | | | | Change-Id: I26842fc754d671051ae406d9c03982bb1db8a3a7 Reviewed-on: http://codereview.qt-project.org/4660 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Made FBO blit behave properlyGunnar Sletta2011-09-122-13/+25
| | | | | | | | | | | | Change-Id: Iad9b9823bbcdf1068455f743e5fbc554939f8592 Reviewed-on: http://codereview.qt-project.org/4630 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Use the context we're givenGunnar Sletta2011-09-121-1/+1
| | | | | | | | | | | | | | Change-Id: I5bdcd1baf1bff86d281664c219098fe841b43fce Reviewed-on: http://codereview.qt-project.org/4629 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * use QtGui/ based includesGunnar Sletta2011-09-091-1/+1
| | | | | | | | | | | | | | Change-Id: I763bdba236aef25685d9d0fa2e02741c2f5c141e Reviewed-on: http://codereview.qt-project.org/4507 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * Make inputcontext plugin loading a bit more genericLars Knoll2011-09-082-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a create() method to the inputcontext factory that takes no arguments. Add a virtual isValid() to QPlatformInputContext to determine whether it actually works. Remove IBUS dependencies in the xcb code so that it can also load other plugins. Change-Id: I6345a845f48fd4b3cacf6d8652711b16835a235c Reviewed-on: http://codereview.qt-project.org/4487 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 00:07:03 +0000