summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into refactorGunnar Sletta2011-09-1222-699/+848
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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>
| * Add an SSE4.2 even simpler version of toLatin1Thiago Macieira2011-09-081-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * added -b<file> option to moc to support additional include filesKeno Fischer2011-09-071-3/+18
| | | | | | | | | | | | | | | | | | | | 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>
| * 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>
| * Update V8Aaron Kennedy2011-09-0717-640/+670
| | | | | | | | | | | | | | | | | | 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>
| * 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>
* | 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>
* | 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>
* | 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-0810-313/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* | Get rid of QColor::allowX11ColorNames().Samuel Rødal2011-09-072-63/+3
| | | | | | | | | | | | | | | | | | This code is no longer in use. Change-Id: I1e582b8a5f1fad40ef75e412162f3aa9f10ab535 Reviewed-on: http://codereview.qt.nokia.com/4352 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* | send resize event when window resizedMatthew Cattell2011-09-071-2/+8
| | | | | | | | | | | | | | Change-Id: I4415f1dbdf9bcc96dda10d00c8982a9d4ee433c4 Reviewed-on: http://codereview.qt.nokia.com/4344 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Make the xlib platform plugin work againPaul Olav Tvete2011-09-072-3/+3
| | | | | | | | | | | | | | Change-Id: I2921d707a7bed7cfba19e49283e3ec5eab3c449b Reviewed-on: http://codereview.qt.nokia.com/4343 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Do not leak memoryJan-Arve Saether2011-09-071-4/+5
| | | | | | | | | | | | | | | | | | Task-number: QT-4333 Change-Id: Idadb3eec3ac1b8775017ead6deff38e22d5b04b2 Reviewed-on: http://codereview.qt.nokia.com/4323 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* | Cocoa: QMenu refactor.Morten Sorvig2011-09-0737-1395/+940
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change prepares for enabling native menus on OS X. Move code from src/widgets to cocoa: - qcocoaapplicaiton - qcocoaapplicaitondelegate - qcocoamenuloader - qcocoamenu - qmenu_mac - misc helpers to qcocoahelpers Create a QNSApplication and QCocoaApplicationDelegate at application startup. New Lighthouse API: - class QPlatformMenu - class QPlatformMenuBar - QPlatformIntegration::createPlatformMenu() - QPlatformIntegration::createPlatformMenuBar() Platforms that wants a native menu integration subclasses QPlatformMenu[|Bar] and implements the create function. The default implementation returns 0, which causes QMenu to use the standard Qt menus. This API is based on the current native menu abstraction that Mac, Wince and S60 uses in Qt 4. The main difference is that the platform classes are proper standalone classes and not #ifdeffed into QMenuPrivate. Change-Id: I3da41f80b0ae903a476937908b1f9b88014b7954 Reviewed-on: http://codereview.qt.nokia.com/4068 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | Fixed tst_QGL::destroyFBOAfterContext().Samuel Rødal2011-09-073-2/+13
| | | | | | | | | | | | | | | | | | Properly free QOpenGLContext in QGLContext::reset(), if we own it. Change-Id: Ibd913283cf8b3b8a4dc6295a878a22a3989309a7 Reviewed-on: http://codereview.qt.nokia.com/4320 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | move QSurface into its own file.Jørgen Lind2011-09-078-39/+277
| | | | | | | | | | | | | | | | | | also move QPlatformSurface to its own file Change-Id: I29fb6c70ede18a0ac5e0f6bfb97a33293633e668 Reviewed-on: http://codereview.qt.nokia.com/4309 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Fixed symbol lookup failure with xcb when using GLX and XRender.Samuel Rødal2011-09-071-1/+1
| | | | | | | | | | | | | | Change-Id: I17870f0acd934bf6203e432d406f1717d99386ee Reviewed-on: http://codereview.qt.nokia.com/4310 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Fixed crash in tst_QGL::multipleFBOInterleavedRendering().Samuel Rødal2011-09-073-29/+32
| | | | | | | | | | | | | | | | | | Properly check for the ElementIndexUint extension. Change-Id: I8117aa052f2dd697a2dadeb7ce84a415b5fd24c8 Reviewed-on: http://codereview.qt.nokia.com/4311 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Fixed tst_QGL::partialGLWidgetUpdates.Samuel Rødal2011-09-072-6/+32
| | | | | | | | | | | | | | Change-Id: Ie37051e28b199b5d159f5be05be41efbd17fdf08 Reviewed-on: http://codereview.qt.nokia.com/4273 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Clang build fix: QPixmap::init -> QPixmap::doInitJani Uusi-Rantala2011-09-072-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | QPixmap::init shadows base class QPaintDevice::init with different declaration which makes latest clang builds fail on modules. Simple renaming of this private function fixes the issue. Change-Id: I65b2b09e81f4833dc9b54b36423ba7c15d9ded4f Reviewed-on: http://codereview.qt.nokia.com/4289 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Fix try #2 at QSurface missing a virtual destructorJani Uusi-Rantala2011-09-062-0/+6
| | | | | | | | | | | | | | | | | | | | All virtual base classes with accessible destructor should declare the destructor as virtual too. Change-Id: I2b07c7e824612af072d7802095d958dca8cc34c8 Reviewed-on: http://codereview.qt.nokia.com/4274 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | add support for QWindow in mouseEventMatthew Cattell2011-09-061-1/+70
| | | | | | | | | | | | | | Change-Id: I0cbc2f2e6f4753da44a7709b31cf0e228def628c Reviewed-on: http://codereview.qt.nokia.com/4271 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | added support for qwindowMatthew Cattell2011-09-061-3/+72
| | | | | | | | | | | | Change-Id: I5611a5d3590be596457dcad5e431ae110c2c8b47 Reviewed-on: http://codereview.qt.nokia.com/4258 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge remote branch 'gerrit/master' into HEADSamuel Rødal2011-09-06101-1708/+1198
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/global/qglobal.h src/gui/kernel/qplatformnativeinterface_qpa.h src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qmenu_mac.mm src/gui/widgets/qmenu_p.h src/gui/widgets/qmenubar.cpp src/gui/widgets/qmenubar_p.h src/gui/widgets/widgets.pri src/plugins/platforms/wayland/qwaylandnativeinterface.cpp src/plugins/platforms/wayland/qwaylandnativeinterface.h src/src.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp tests/auto/qstring/tst_qstring.cpp Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 04:26:03 +0000