summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Windows: correctly disable ibus plugin on WindowsRohan McGovern2011-09-141-1/+1
| | | | | | | | | The correct qmake scope is `win32', not `win'. Change-Id: I148e764bbe94b6ca824a55458e080ca948dc304d Reviewed-on: http://codereview.qt-project.org/4844 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* export QActionPrivate, as the Mac Cocoa plugin needs itLars Knoll2011-09-131-1/+1
| | | | Change-Id: Id193702dd4d976bf2d822616afca5e7573b5fb86
* Remove uilib and QtUiTools from QtBaseLars Knoll2011-09-138-1262/+1
| | | | | | | The code gets moved into the qttools repository, where it belongs naturally. Change-Id: Ia50bfe212ead3365d5c3bcb24d2c5e92e2e9de8e
* Merge branch 'refactor'Gunnar Sletta2011-09-132480-411711/+342208
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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-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>
| * 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>
| * 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>
| * 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>
| * 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
| * | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 07:39:03 +0000