summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Add function QGlyphRun::setRawData()Eskil Abrahamsen Blomfeldt2011-06-077-53/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To provide an optimized way of constructing QGlyphRun objects with no copying or allocation, we add function setRawData() (naming inspired by QByteArray::setRawData()). Data retrieved from QRawFont can be passed directly into this. The logic is now that the data pointers in QGlyphRunPrivate should always point to the current valid data and is what will be used in comparisons and drawing calls. The vectors are optimizations to avoid unnecessary copying if the user wants to use the QVector based API (which makes it easier to manage the memory.) This reflected in the functions that return QVectors, which will return the stored vector if and only if it is identical to the current pointer. Otherwise we will have to copy the memory. The internal addition operators in QGlyphRun have been removed since they really provide no real optimization and have an unclear definition if the two glyph runs are based on different fonts. Reviewed-by: Jiang Jiang (cherry picked from commit 86d88c5b719fd3d50336d9d8e7127b8045ee82ae) Change-Id: Id5bb55ee3d93afb32ffca850f53382e856df7b3e Reviewed-on: http://codereview.qt.nokia.com/342 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * Added private header dependencies to MeeGo graphics system pluginEckhart Koppen2011-06-061-1/+1
| | | | | | | | | | | | | | | | | | Depends on core, gui and opengl private headers Change-Id: If3266c3b7233bf40b5ad80a8a99fd5f2c7eafcec Reviewed-on: http://codereview.qt.nokia.com/336 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eckhart Koppen <eckhart.koppen@nokia.com>
| * Use Raster pixmaps for the EglFS pluginGunnar Sletta2011-06-061-2/+2
| | | | | | | | | | | | | | Change-Id: Id94df7b5ebe298104d05bee3ae58e06201c596f7 Reviewed-on: http://codereview.qt.nokia.com/334 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * Added module CONFIG to uitools.axis2011-06-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | This seems to be necessary for installing, and has no side effects that I can tell. Change-Id: Ic778b8a3937621ddd401ddd83d05831460db8f39 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/236 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Make qmake slightly more verbose with its syncqt output.axis2011-06-061-3/+5
| | | | | | | | | | | | | | | | | | | | It can be hidden with -silent, however. Change-Id: I6dbd3c743779b8d2070e41f007df26b530987429 Reviewed-on: http://codereview.qt.nokia.com/235 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * Disable trying to compile network tests which require QtScriptMarius Storm-Olsen2011-06-062-3/+2
| | | | | | | | | | | | | | | | | | | | Those tests should be moved to QtScript/tests/auto Change-Id: Icc0c50ef35ac08e604ab18cb87b0c2b19f2fc72c Reviewed-on: http://codereview.qt.nokia.com/197 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Markus Goetz Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * Moved common module profiles to be feature profiles.axis2011-06-0521-289/+292
| | | | | | | | | | | | | | | | | | | | This enables external modules to also make use of them without having access to the complete QtBase source code. Change-Id: I056e45cba6c6798b76670b8d238dadb2d9f9c092 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/234 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Correct antialias disabling logic for Core TextJiang Jiang2011-06-041-3/+2
| | | | | | | | | | | | | | | | | | | | We should always turn antialias off when QFont::NoAntialias being passed in styleStrategy. That corrects some QStaticText tests. Change-Id: Iaffc5f3bb7f501dcb648cab41a8b6ffcf93f90ae Reviewed-on: http://codereview.qt.nokia.com/328 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Correct QStaticText tests after recent changesJiang Jiang2011-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | Raster engine on Mac now correctly handles transformation, so no need to XFAIL anymore. Also fixes a drawStaticText origin mistake, the y origin should be the top left point rather than the baseline. Change-Id: I6058e7099b336d9d5a6586344a07be3c7d76fb64 Reviewed-on: http://codereview.qt.nokia.com/329 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Implemented module-local caching of module profiles.axis2011-06-033-22/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use syncqt to generate .qmake.cache also for submodules, which contains the location of forwarding module profiles for that module. This enables us to build without having to put module profiles into mkspecs/modules until install time. Also added support for -developer-build to syncqt. What it does is to point build directories for binaries and libraries to a common location in QtBase. This is more convenient when doing development, since you don't need to set your path to every module's bin/ directory, but it cannot be used with release builds, since they need to build independently of QtBase, in their own directory. Change-Id: I959c62c11c644f2147a98da894a72452d9c44327 Task: QTBUG-19585 Task: QTBUG-19583 Reviewed-on: http://codereview.qt.nokia.com/232 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Install some headers that were previously missing from install.axis2011-06-032-1/+15
| | | | | | | | | | | | | | | | Change-Id: I58a5f58e6e03e3e266de23beee47de0c823f3240 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/233 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Don't base QTDIR detection on .qmake.cache.axis2011-06-031-7/+0
| | | | | | | | | | | | | | | | Change-Id: I4adc26c1c070d26277551d302f4638b819ddc311 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/231 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Make sure that we error out if we cannot write forwarding profile.axis2011-06-031-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ic0b62532dd8a52cf6ab7a7c10c5ffbe3c9039ec1 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/229 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Changes needed for Qt to accept module .qmake.cache files.axis2011-06-031-3/+8
| | | | | | | | | | | | | | | | | | | | | | Also introduced the QMAKE_EXTRA_MODULE_FORWARDS for specifying a folder where forwarding profiles will be put. Change-Id: I8cb242838a5a4d42dc5e3cfd0bd858ab0d2696cd Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/230 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Add basic static text drawing capability to lanceJiang Jiang2011-06-033-0/+143
| | | | | | | | | | | | | | | | Task-number: QTBUG-17514 Change-Id: Ife7cd8f940424d805f634ca190bcbf6fd83d8682 Reviewed-on: http://codereview.qt.nokia.com/321 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: aavit <qt_aavit@ovi.com>
| * Fix Windows buildJiang Jiang2011-06-031-2/+2
| | | | | | | | | | | | | | Change-Id: Ieafe2cefe0dcb00a3b22133506fb854428abff5e Reviewed-on: http://codereview.qt.nokia.com/320 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Refactor glyph pretransform checkJiang Jiang2011-06-039-56/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move paintEngineSupportsTransformations logic from QPainter to paint engine subclasses. Simplify and consolidate checks for cached drawing (pretransformed) and path drawing (untransformed) in raster paint engine. Fix unnecessary transform when paint engines actually take the path drawing track. Fix scaling and rotation transform in raster engine for Mac. Task-number: QTBUG-19086 Change-Id: I1c0c1800a5173d3db765b9fccfd0e7a3628e3815 Reviewed-on: http://codereview.qt.nokia.com/298 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * Fixed an argument parsing bug in syncqt.axis2011-06-021-6/+6
| | | | | | | | | | | | | | | | | | | | | | We need to move the detection up above the general -no-* match, otherwise it never hits. Change-Id: I04ab5a1ed2c4a01219e7b9e10948b3fc4989f4b8 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/228 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Allow SHM buffers to be displayed in Wayland plugin when using DRMAndy Nichols2011-06-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | When running an application with the wayland backend, SHM window surfaces were not being displayed on the wayland-demo compositor as wl_surface_damage was being called, but not wl_buffer_damage as well. Change-Id: I2ffea3bbb20cb3729cd029bd21855819cd7fcf55 Reviewed-on: http://codereview.qt.nokia.com/305 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * tst_qnetworkreply: add a test for http abort.Martin Petersson2011-06-011-6/+52
| | | | | | | | | | | | | | Change-Id: Iec5fe195ff2befe92e759f77768240728bef31bd Reviewed-on: http://codereview.qt.nokia.com/302 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Markus Goetz
* | Fix QtPlatformSupport when compiling with glx and xcbJørgen Lind2011-06-102-3/+3
| |
* | Fix versionheader name for QtPlatformSupportJørgen Lind2011-06-101-1/+1
| |
* | idc: Do not link against QtGui.Friedemann Kleint2011-06-102-1/+3
| | | | | | | | (which throws off the build order).
* | Remove the platforms/install_rules directoryJørgen Lind2011-06-105-56/+0
| |
* | Update dependency list in xcb READMEJørgen Lind2011-06-101-1/+1
| |
* | QtPlatformSupport: A helper library for platform pluginsJørgen Lind2011-06-1064-256/+179
| | | | | | | | | | | | | | | | QtPlatformSupport is a static library. Platform plugins are meant to link against this library to pull in dependencies such as fontengines and convenience functions for finding the right GL configs. The linker will only pull in the symbols used, so the size of the library doesn't really matter
* | Actually add QEventDispatcherMac.Morten Sorvig2011-06-102-0/+1368
| |
* | QWindowContext / QWindowFormat refactor.Samuel Rødal2011-06-1077-1038/+1426
| | | | | | | | | | | | | | | | | | | | | | | | | | To enable having a single GL context used for multiple drawables we need to de-couple the context class a bit more from the window class in the plugin API. Now contexts are created stand-alone based on a GL format and a share context, and when calling makeCurrent() a desired surface is specified. This maps well to GLX, EGL, Cocoa, AGL, and WGL, which all support this use case. QWindowContext is renamed to QGuiGLContext, and QWindowFormat is renamed to QGuiGLFormat. We have the ability to introduce a pbuffer or similar other offscreen GL drawable abstraction in the future.
* | Use XLookupString for translating key events.Laszlo Agocs2011-06-093-35/+82
| | | | | | | | | | | | | | | | | | There seems to be no easy equivalent in the XCB world and the fallback we currently have is really incomplete. Hence we will call XLookupString with a fake XKeyEvent if XCB_USE_XLIB is enabled. Reviewed-by: Samuel Rødal
* | Add QEventDispatcherMac.Morten Sorvig2011-06-099-184/+19
| | | | | | | | | | Create it directly in QGuiApplication for now, later on we'll move it to the cocoa plugin.
* | Remove QPlatformEventLoopIntegration.Morten Sorvig2011-06-0910-425/+17
| | | | | | | | | | | | | | | | Instead we'll let the platform plugins construct an QEventDispatcherQPA subclass. This API will be added later on. This temporarily breaks cocoa, uikit and opencode.
* | Bail out from cursor creation when malloc fails.Laszlo Agocs2011-06-091-0/+6
| |
* | Get modifier mapping using standard X, no need for libxkbcommon here.Laszlo Agocs2011-06-092-33/+52
| | | | | | | | Reviewed-by: Samuel Rødal
* | Create custom cursors via XRender.Laszlo Agocs2011-06-096-15/+120
| | | | | | | | Reviewed-by: Samuel Rødal
* | Cursor support in xcb plug-in.Laszlo Agocs2011-06-0819-178/+1002
| | | | | | | | | | | | | | Custom cursor pixmaps with depth greater than 1 are not yet supported and will be converted to monochrome always. Reviewed-by: Samuel Rødal
* | Avoid out of bounds writeLars Knoll2011-06-081-2/+4
| | | | | | | | Reviewed-by: Samuel
* | Undefine DrawText in qlineedit.cppOlli Werwolff2011-06-081-0/+3
| | | | | | | | | | | | | | | | | | There is a #define DrawText DrawTextW in winuser.h which is included in windows.h so that the enum value in line 1981 is seen as DrawTextW and thus is not a valid enum value on Windows. Reviewed-by: Samuel Reviewed-by: Lars Knoll
* | Most checks for windows in widgets have to be ws specificOlli Werwolff2011-06-084-8/+8
| | | | | | | | | | Reviewed-by: Samuel Reviewed-by: Lars Knoll
* | use correct includes in qaccessible_win.cpp/qwizard_win_p.hOlli Werwolff2011-06-082-5/+5
| | | | | | | | | | Reviewed-by: Samuel Reviewed-by: Lars Knoll
* | Do not compile _win files when -qpa is usedOlli Werwolff2011-06-084-5/+5
| | | | | | | | | | Reviewed-by: Samuel Reviewed-by: Lars Knoll
* | QTextDocumentLayout has to be exported as it is used in widgetsOlli Werwolff2011-06-081-1/+1
| | | | | | | | | | Reviewed-by: Samuel Reviewed-by: Lars Knoll
* | Fixed compilation with QT_NO_PRINTEROlli Werwolff2011-06-081-0/+2
| | | | | | | | | | Reviewed-by: Samuel Reviewed-by: Lars Knoll
* | cosmetic changesLars Knoll2011-06-082-5/+5
| |
* | Fix behaviour after WM_TAKE_FOCUSLars Knoll2011-06-081-1/+0
| | | | | | | | | | | | | | We should not call requestActivateWindow() in reaction to WM_TAKE_FOCUS. Looks like it should only be done if the focus should in fact go to a modal child of the widget.
* | Use Q_WIDGETS_EXPORT for widgets libraryOlli Werwolff2011-06-08227-450/+465
| | | | | | | | Reviewed-by: Lars Knoll
* | revert accidental commitLars Knoll2011-06-071-1/+1
| |
* | remove unused codeLars Knoll2011-06-071-118/+0
| |
* | cleanups codeLars Knoll2011-06-079-166/+147
| | | | | | | | | | | | | | Make QXcbClipboard and QXcbDrag a QXcbObject to simplify the code. Use the predefined atoms in xproto.h instead of our own defines.
* | Implement QDropEvent::source() againLars Knoll2011-06-075-10/+8
| | | | | | | | | | | | | | | | QDropEvent::source() now returns a QObject instead of a widget, matching the implementation in QDrag. Reviewed-by: Samuel
* | reset certain global variables on deletionLars Knoll2011-06-071-0/+2
| | | | | | | | | | | | | | qt_button_down needs to be reset to 0 if it points to the widget being deleted. Reviewed-by: Samuel