summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Disabled tests for refactor->master integrationJo Asplin2011-09-1336-17/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change disables failing tests to increase the likelihood that 'make check' terminates with a zero exit status. This is done to prevent the CI system from blocking further commits once qtbase#refactor is merged into qtbase#master. Failing tests are marked as insignificant (by putting 'CONFIG += insignificant_test' in the .pro file). Note: This is a temporary measure that needs to be cleaned up once the refactor->master integration is complete. Ideally all disabled tests need to be enabled and passing. All changes will be marked by the string QTBUG-21402 in a comment for easy location. Task-number: QTBUG-21402 Change-Id: Ic4400671671f6d9b75b106a6aa4755b20e74378d Reviewed-on: http://codereview.qt-project.org/4678 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * hack to allow qWaitForWindowShown to be used in test cases that use QWindowMatthew Cattell2011-09-121-0/+7
| | | | | | | | | | | | | | Change-Id: Id51aaf81d898f9159e4587613f5e34c3de9a5808 Reviewed-on: http://codereview.qt-project.org/4690 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * added ascii translations to qasciikey for keyup and keydownMatthew Cattell2011-09-122-1/+2
| | | | | | | | | | | | | | Change-Id: I7645392b437bdaa5e981dbf07cac70ee1653b624 Reviewed-on: http://codereview.qt-project.org/4689 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Implemented texture cache for GL paint engine in QtGui.Samuel Rødal2011-09-128-120/+350
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Added new QOpenGLPaintDevice test case in tst_QOpenGL.Samuel Rødal2011-09-121-0/+42
| | | | | | | | | | | | | | Change-Id: Ic56e4c236f52fbd5c570bb647d5d1f4e5f9e7924 Reviewed-on: http://codereview.qt-project.org/4662 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Fix compilationLars Knoll2011-09-121-2/+2
| | | | | | | | | | | | Change-Id: I0b562f810bc12e728f59976ad8467a5ce9fd9bec Reviewed-on: http://codereview.qt-project.org/4666 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Fixed auto-test failure in tst_QOpenGL.Samuel Rødal2011-09-122-9/+8
| | | | | | | | | | | | | | | | | | 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>
| * Fixed race condition in xcb plugin logging (when debugging is enabled).Samuel Rødal2011-09-122-0/+4
| | | | | | | | | | | | | | Change-Id: I8fa11ba26037d8f78e7c5131326d94836d0de9d4 Reviewed-on: http://codereview.qt-project.org/4647 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>
| * Disambiguated access to QTestLib APIJo Asplin2011-09-122-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 overloads QTestLib so that QWindow * can be passed directly to certain functions. This fix disambiguates access to the new API by selecting the QWindow * versions. This assumes that the QWidget * versions are kept mostly for backwards compatibility. Change-Id: I075196d86d8d1d38f7192dace3c3892d315bf671 Reviewed-on: http://codereview.qt-project.org/4655 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
| * Disambiguated access to QTestLib APIJo Asplin2011-09-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 overloads QTestLib so that QWindow * can be passed directly to certain functions. This fix disambiguates access to the new API by selecting the QWindow * versions. This assumes that the QWidget * versions are kept mostly for backwards compatibility. Change-Id: I8755c86d5ebeb275dfa9162b0168d9179a61982d Reviewed-on: http://codereview.qt-project.org/4640 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
| * Add other.pro back to auto.proJo Asplin2011-09-122-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The other/ subdirectory should still be built via other.pro. This was overlooked by Commit 0a208dd4135fc16d05f9fd8c417d99e3f39c39fb Task-number: QTBUG-21327 Change-Id: Ie8ebd7dfc5b1dd56ca1b629aa011d160cb563ddd Reviewed-on: http://codereview.qt-project.org/4526 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Moved autotests in category 'tools' into new directory structureJo Asplin2011-09-12369-4/+8
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-21355 Change-Id: I315d4b1f55d42391524c0e8625952dee1b96fca3 Reviewed-on: http://codereview.qt-project.org/4449 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Fix crash in QPlatformInputContextFactory.Samuel Rødal2011-09-121-1/+1
| | | | | | | | | | | | | | | | | | If ic is null we shouldn't dereference it. Change-Id: Idf472c799f8207d893f15a55fac330ea20ec451c Reviewed-on: http://codereview.qt-project.org/4639 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Modify mkspecs/unsupported/macx-clang/qplatformdefs.hTakumi ASAKI2011-09-121-55/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now mkspecs/unsupported/macx-clang/qplatformdefs.h includes mkspecs/common/mac/qplatformdefs.h. This patch fixes that Qt built with clang failes to load cocoa platform plugin without QT_QPA_PLATFORM environment variable. Change-Id: Id48268eaf7ba24403f91497539ef0dab6f22a9dc Reviewed-on: http://codereview.qt-project.org/4564 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * don't build ibus plugin on windows/macGunnar Sletta2011-09-121-1/+1
| | | | | | | | | | | | | | Change-Id: I932eaea19806e3ce75803cb2849d04292885fbd5 Reviewed-on: http://codereview.qt-project.org/4631 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>
| * Moved autotests in category 'testlib' into new directory structureJo Asplin2011-09-12217-3/+7
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-21353 Change-Id: I2e2ad4b7570f80b3e6500821f769e967f0a75027 Reviewed-on: http://codereview.qt-project.org/4438 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Merge branch 'master' into refactorGunnar Sletta2011-09-1238-720/+986
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/gui/text/qfont_qpa.cpp src/gui/widgets/qlinecontrol.cpp src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp tests/auto/gui.pro tests/auto/network.pro tests/auto/qstring/tst_qstring.cpp Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
| * | Fixed build error in tst_qopenglJo Asplin2011-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLFramebufferObject must be wrapped in a QOpenGLPaintDevice before being passed to QPainter::begin(). Change-Id: Ic82f8f17b2ea18a3790de7e75f0dd6c9092528ed Reviewed-on: http://codereview.qt-project.org/4541 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Clang Build Fix: Cocoa platform pluginTakumi ASAKI2011-09-094-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some assignment from const values to non-const without cast. Move #import to avoid compile error. Fix type mismatch. Change-Id: I93ae5cd07827b92a91093df979992616b26b14af Reviewed-on: http://codereview.qt-project.org/4536 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * | added additional qwindow test support functions for keyboard and mouse eventsMatthew Cattell2011-09-092-1/+85
| | | | | | | | | | | | | | | | | | Change-Id: Id5be7053c917bcefb2bb8cfab58de0933baf15d3 Reviewed-on: http://codereview.qt-project.org/4540 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Moved autotests in category 'opengl' into new directory structureJo Asplin2011-09-0914-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21356 Change-Id: I496680aa670af3409e50e1c254ef2c557b414d33 Reviewed-on: http://codereview.qt-project.org/4452 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * | Moved autotests in category 'other' into new directory structureJo Asplin2011-09-0960-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21327 Change-Id: I296063b665809e0411a7546fc9b41a287317ecb7 Reviewed-on: http://codereview.qt-project.org/4326 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * | Moved network autotests into new directory structureJo Asplin2011-09-09282-66/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21223 Change-Id: I55dbf5c42a1c5d938b9e0c9bf7d90457a6c26bbc Reviewed-on: http://codereview.qt-project.org/4259 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@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-087-21/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Fixup a few minor errors in the previous commitLars Knoll2011-09-083-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods need to be Q_INVOKABLE to be able to call them with QMetaObject::invokeMethod(). Also use the correct return type. This makes the IBUS input context work again. Change-Id: If7ed6dd8fb99f3363c4ecebb98f889ed9eeeff00 Reviewed-on: http://codereview.qt-project.org/4486 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Add plugin mechanism to load platform input contextsJoona Petrell2011-09-0827-33/+441
| | | | | | | | | | | | | | | | | | | | | Change-Id: I6e74fd395325445420efce4adf13e89abe8177ee Reviewed-on: http://codereview.qt-project.org/4482 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Make QKeySequence work on Mac.Morten Sorvig2011-09-082-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace WS_MAC with OS_MAC. Change-Id: I28a7f7cb65b61f00a3a12f3b257a553b511f85af Reviewed-on: http://codereview.qt-project.org/4353 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * | Disambiguated access to touch event API in QTestLibJo Asplin2011-09-081-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 079ec157f82f79814bd70a1f8753daa37b8d5c3f overloads the touch event API in QTestLib so that QWindow * can be passed directly to certain functions. This fix disambiguates access to the new API by selecting the QWindow * versions. This assumes that the QWidget * versions are kept mostly for backwards compatibility. Change-Id: Ib6b33edc64d81f300d4109d59fd29f25ccd605db Reviewed-on: http://codereview.qt-project.org/4443 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | fixed mouseMoveMatthew Cattell2011-09-081-5/+11
| | | | | | | | | | | | | | | | | | Change-Id: I95dd22ed3216f5ad169393f535e27b1b397c8433 Reviewed-on: http://codereview.qt-project.org/4462 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Remove internal uses of Software input panel events.Pekka Vuorela2011-09-083-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced with QInputPanel method calls. Only remaining instance in QApplication::notify(). Change-Id: I384661f81d08b4322ce538bb21dbce9c7aef2f87 Reviewed-on: http://codereview.qt-project.org/4454 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Change the QInputMethodQueryEvent to be able to query a set of propertiesLars Knoll2011-09-084-12/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event now takes a Qt::InputMethodQueries bitfield. Like this the editor can set all properties in one go on the event instead of having to process many query events. Change-Id: Ifd9d7328a9fce0c21625371ec744ea2090e163be Reviewed-on: http://codereview.qt-project.org/4448 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Use new QInputPanel update function in QTextControlJoona Petrell2011-09-081-7/+3
| | | | | | | | | | | | | | | | | | | | | Change-Id: I20f4aa4e469b507ddb40381e922dcf23f6a469b8 Reviewed-on: http://codereview.qt-project.org/4436 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Remove QT3_SUPPORT code from QMenu classesMorten Sorvig2011-09-088-1485/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: I22df8f96ddca9784d6487a59a0c780ca9641fe23 Reviewed-on: http://codereview.qt-project.org/4434 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * | Rename ImMicroFocus to ImCursorRectangleLars Knoll2011-09-0810-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also set ImhMultiLine on QTextEdit Change-Id: I04a5a1d69c2048ea94c24210e2b8374f334be1b6 Reviewed-on: http://codereview.qt-project.org/4414 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Improved and made public the QOpenGLPaintDevice API.Samuel Rødal2011-09-0813-405/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new API is more flexible, allowing the use of QOpenGLPaintDevice with any QOpenGLContext, and putting more responsibility on the user for ensuring the correct FBO is current (the user knows best anyhow). Task-number: QTBUG-21263 Change-Id: I50b954125f552baef52fbb3fe2ed907a11ad519c Reviewed-on: http://codereview.qt-project.org/4325 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * | Added equivalent to tst_QGL::destroyFBOAfterContext() in tst_QOpenGL.Samuel Rødal2011-09-081-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | The more the merrier. Change-Id: I401ed97600a890c38cb4d5dbe0578d6bcf68e909 Reviewed-on: http://codereview.qt-project.org/4322 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * | Fix a typo in the method nameLars Knoll2011-09-083-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic23877e46b0b94222ae10d5ac766825ea5184e3e Reviewed-on: http://codereview.qt-project.org/4403 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | MicroFocus is in item coordinatesLars Knoll2011-09-086-30/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always set the microFocus/cursorRectangle in item coordinates. Correctly update the itemTransform in the QInputPanel for QWidgets. Change-Id: Ic0187f808996f31e6238d934f43bc97a70522a55 Reviewed-on: http://codereview.qt-project.org/4402 Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Added QInputPanel::commit()Pekka Vuorela2011-09-084-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be called when input context is expected to commit what it had as preedit, and resetting its state. Earlier this was done with ::reset() when in fact documentation somewhat disallowed doing so. Change-Id: I10ad0620aa42fce6d01a69265af8a4f5f9f4d397 Reviewed-on: http://codereview.qt-project.org/4401 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
| * | The keyboard position doesn't change when the item transform changes.Lars Knoll2011-09-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icc93898c854cffdffffa351a5d28e8604e53ee73 Reviewed-on: http://codereview.qt-project.org/4400 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Renamed some of the methods in the QInputPanelLars Knoll2011-09-085-31/+32
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ida03ef170e664f79708149c11a00772ee78a984b Reviewed-on: http://codereview.qt-project.org/4399 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Add a forward declaration for QTransformLars Knoll2011-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a67a48cb700bfca7c6f6b55fe5ef30b4fdcf400 Reviewed-on: http://codereview.qt-project.org/4398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Fix RTL layout for fonts when non-printable character has an advanceJohn Tapsell2011-09-082-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a non-printable character has an advance, we would lay out the text as if the character was part of the output, and then ignore the character later when the text was rendered. To fix cases such as this, we take the dontPrint attribute into consideration when adjusting the advances. Task-number: QTBUG-21347 Reviewed-by: Eskil Reviewed-by: Lars (cherry picked from commit 6326227674efa85c1a5320141041110d211efc75) Change-Id: I4d01b60498f3b5f30b69530c8b49dd720d83ad0b Reviewed-on: http://codereview.qt-project.org/4410 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | More xlib plugin fixesPaul Olav Tvete2011-09-083-28/+27
| | | | | | | | | | | | | | | | | | | | | Change-Id: I8b8093cd9e66129dd7cc631dd36a2fb27c3d617e Reviewed-on: http://codereview.qt-project.org/4408 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Fix compile error on Mac.Takumi ASAKI2011-09-081-0/+2
| | | | | | | | | | | | | | | | | | | | | Change-Id: I88123bc741303ff440f628f752f39486da81e426 Reviewed-on: http://codereview.qt-project.org/4358 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * | Refactor the input frameworkLars Knoll2011-09-0715-200/+481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Results of the ongoing workshop in Oslo: QInputPanel will be the application facing interface for controlling the input context as well as querying things like the position of the virtual keyboard. QInputContext is significantly cleaned up and only there as a compatibility API for existing code. Change-Id: Ie8e2ee480930763f414bfaae63247b1fb6500c82 Reviewed-on: http://codereview.qt.nokia.com/4357 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>