summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * configure on Windows: Store result of V8 configurationKent Hansen2011-09-091-0/+3
| | | | | | | | | | | | | | | | | | Otherwise V8 won't be built (there's a contains() check in src.pro). Change-Id: Iba65e85baae1e80800e5ca0da49fde8958dfd659 Reviewed-on: http://codereview.qt-project.org/4524 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fix a few memory leaks for QFontconfigDatabaseJiang Jiang2011-09-091-19/+22
| | | | | | | | | | | | | | Change-Id: I015a9287f03d6965a77461d3e894de0492547cf3 Reviewed-on: http://codereview.qt-project.org/4480 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * Update V8Aaron Kennedy2011-09-0916-14/+60
| | | | | | | | | | | | | | | | | | | | Add a "NativeMode" to V8 script compilation. Change-Id: I73b087c9787ca7f961c2af89f45de2b8813ce1a5 Task-number: QTBUG-20344 Reviewed-on: http://codereview.qt-project.org/4500 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * tests: use contains(QT_CONFIG,private_tests) consistentlyRohan McGovern2011-09-093-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests used requires(contains(QT_CONFIG,private_tests)) in their .pro file, but did not subtract themselves from their parent project SUBDIRS when private_tests weren't enabled. In the best case, this wastes a little time as qmake iterates over these projects which won't be built. In some worse esoteric cases, this may break compilation or packaging. Change-Id: I189c108ee9943b15114becf9d6b04f78dbabbe31 Reviewed-on: http://codereview.qt-project.org/4389 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
| * qmake vcxproj generator: fix XML conversion for build eventsJoerg Bornemann2011-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20419 Change-Id: I52069e0beb2b39ec4a67e83de583efd2926c6611 Reviewed-on: http://codereview.qt-project.org/4484 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * Add an SSE4.2 even simpler version of toLatin1Thiago Macieira2011-09-082-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new PCMPESTRM instruction (Parallel CoMPare Explicit-length STRings with result in a Mask) which is added in SSE4.2 for facilitating string operations. The "compare ranges" mode allows us to search for characters outside the Latin 1 range and then use the SSE4.1 PBLENDVB instruction to replace those with question marks. Unlike previous SSE compare instructions, the PCMPxSTRx family allows us to operate on unsigned 16-bit values. This saves us another parallel add. Reviewed-By: Samuel Rødal (cherry picked from commit 45d2d36c9dbcbce403c78838ea52acd1ab111b68) Change-Id: I0f9d864f9d19c0f0da43ccb6918dc28295074496 Reviewed-on: http://codereview.qt-project.org/4468 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Create a function that merges the SSE common codeThiago Macieira2011-09-081-38/+35
| | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel Rødal (cherry picked from commit bb3bd601560132df769c32808ae0b36c56d1caab) Change-Id: Icd7f661785a793effcd4d8cd08ffa8bb5a592cd9 Reviewed-on: http://codereview.qt-project.org/4467 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Improve toLatin1 x86 SIMD by using a new SSE4.1 instructionThiago Macieira2011-09-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new instruction is PBLENDVB, which creates a result by selecting bytes from one of two registers, depending on whether the mask contains a 1 (0xff) or a zero. The SSE2 code requires three instructions (and, andnot, or). The equivalent Neon instruction is VBSL (bit select). Reviewed-by: Samuel Rødal (cherry picked from commit bdad106358ae177d1345f5ff85c0e38cfeb5ca90) Change-Id: I5b0d055a4be532f81c6f11181d710525cd6c3f25 Reviewed-on: http://codereview.qt-project.org/4466 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Avoid double initialize of platform font databaseJiang Jiang2011-09-081-1/+0
| | | | | | | | | | | | | | | | | | | | Since platform font database will be populated in QFontDatabase::load, no need to do it here in QFont::initialize. Change-Id: I1b8c9f6fc9be40e0263ed3951c794141c6297e84 Reviewed-on: http://codereview.qt-project.org/4091 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Add missing license header.Jason McDonald2011-09-081-0/+41
| | | | | | | | | | | | | | Change-Id: Icbbb450d759b732ab28896365bb5126cf4723a62 Reviewed-on: http://codereview.qt-project.org/4308 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
| * added QMAKE_MOC_OPTIONS variable to qmakeKeno Fischer2011-09-072-2/+5
| | | | | | | | | | | | | | | | | | | | Merge-request: 41 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I8d492e9fbdbeeffa9f702a3a1f2fab314586809f Reviewed-on: http://codereview.qt-project.org/4375 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * added -b<file> option to moc to support additional include filesKeno Fischer2011-09-072-3/+21
| | | | | | | | | | | | | | | | | | | | Merge-request: 41 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I11a532b6ffe5f1c3e08aef8bc564e93f965b9e7c Reviewed-on: http://codereview.qt-project.org/4374 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * tests: fix QNetworkProxyFactory testCorentin Chary2011-09-071-1/+1
| | | | | | | | | | | | | | | | | | QNetworkProxy takes an hostname, not an url. Change-Id: I7504fbc02a817d6c75ee55dc8bbdd66ec1e6cd01 Reviewed-on: http://codereview.qt-project.org/4373 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * Change in tst_qstylesheetstyle.cpp to work around a bug in testcocoon parser.Caroline Chao2011-09-071-1/+1
| | | | | | | | | | | | | | Change-Id: I1361e4c02e0c8a0424957c531e22a7b2236f725d Reviewed-on: http://codereview.qt.nokia.com/4360 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fix missing curly brackets in tst_global.cpp.Caroline Chao2011-09-071-6/+9
| | | | | | | | | | | | | | | | | | Those are required when exception handling is disabled. Change-Id: I9ac862758bd961f4593a66d3e28005d766959478 Reviewed-on: http://codereview.qt.nokia.com/4359 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-072-8/+34
| | | | | | | | | | | | | | | | | | | | | | and do not only check leaf certificates, but all intermediates and the root. Tested manually with the cross-signed intermediates. Change-Id: I860dc9b568bc244abc9228486dbb374a1a2b47c4 Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 64adbd0c5775f97343afbe0e7b5fde0d70bdaedd) Reviewed-on: http://codereview.qt.nokia.com/4291 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * Partially revert 25a0cf881e6ca6dc8bd969e7047c3967796fcd94Aaron McCarthy2011-09-071-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | After the regexs in qtmodule-tests were fixed in the same commit it is no longer necessary to explicitly add the include statement. Any existing content unrelated to config tests is preserved. Change-Id: I90bab6b838191f050204992aa45262212b937059 Reviewed-on: http://codereview.qt.nokia.com/4296 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Update V8Aaron Kennedy2011-09-0721-640/+721
| | | | | | | | | | | | | | | | | | This fixes a few bugs in QML mode name resolution and simplifies our V8 patchset a little by folding some patches together. Change-Id: Ia528a43ac8ccad95ac81bcdff5d05aaeab4b48b2 Reviewed-on: http://codereview.qt.nokia.com/4294 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * Fixed compilation of QtV8 for macRohan McGovern2011-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | configure is currently whitelisting a set of architectures which are known to be capable of building V8. macosx was omitted from this list. Note that we don't attempt to differentiate between different macosx architectures; we expect any mac which is capable of building Qt5 at all is also capable of building V8. Change-Id: I345f2a446d650cbeb1e2ad81656cdbeea6fa0d9a Reviewed-on: http://codereview.qt.nokia.com/4293 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * Fix TextInput test failures.Andrew den Exter2011-09-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | emitCursorPositionChanged won't emit cursorPositionChanged if the cursor position hasn't changed but that doesn't mean the micro focus hasn't changed, so emit updateMicroFocus changed when cursorPositionChanged isn't. Task-number: QTBUG-21017 QTBUG-21011 Change-Id: Id0b6bd5aed16563b7b5cce643745e453ba4857a5 Reviewed-on: http://codereview.qt.nokia.com/4181 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * configure should detect whether v8 can be builtKent Hansen2011-09-061-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, the -v8 option was missing from the set of "Qt style yes options", so it wasn't even recognized. Second, when the value is "auto" (the default), v8 should only be enabled if we are building for a supported architecture. Currently that's i386, x86_64, and arm. (When cross-compiling, CFG_ARCH will contain the target architecture, which is what we want to check.) Third, if -v8 is passed but the architecture isn't supported, configure should issue an error. Change-Id: I579597bc0d81c3097ee96a29493f5f8112be7edd Reviewed-on: http://codereview.qt.nokia.com/4193 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | 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>