Changeset 769 for trunk/src/gui/embedded


Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/gui/embedded/directfb.pri

    r651 r769  
    1616#DEFINES += QT_NO_DIRECTFB_OPAQUE_DETECTION
    1717#DEFINES += QT_NO_DIRECTFB_STRETCHBLIT
    18 #DIRECTFB_DRAWINGOPERATIONS=DRAW_RECTS|DRAW_LINES|DRAW_IMAGE|DRAW_PIXMAP|DRAW_TILED_PIXMAP|STROKE_PATH|DRAW_PATH|DRAW_POINTS|DRAW_ELLIPSE|DRAW_POLYGON|DRAW_TEXT|FILL_PATH|FILL_RECT|DRAW_COLORSPANS|DRAW_ROUNDED_RECT
     18DIRECTFB_DRAWINGOPERATIONS=DRAW_RECTS|DRAW_LINES|DRAW_IMAGE|DRAW_PIXMAP|DRAW_TILED_PIXMAP|STROKE_PATH|DRAW_PATH|DRAW_POINTS|DRAW_ELLIPSE|DRAW_POLYGON|DRAW_TEXT|FILL_PATH|FILL_RECT|DRAW_COLORSPANS|DRAW_ROUNDED_RECT
    1919#DEFINES += \"QT_DIRECTFB_WARN_ON_RASTERFALLBACKS=$$DIRECTFB_DRAWINGOPERATIONS\"
    2020#DEFINES += \"QT_DIRECTFB_DISABLE_RASTERFALLBACKS=$$DIRECTFB_DRAWINGOPERATIONS\"

  • trunk/src/gui/embedded/qscreen_qws.cpp

    r651 r769  
    27402740                break;
    27412741            }
    2742             spanData.setup(qwsServer->backgroundBrush(), 256, QPainter::CompositionMode_SourceOver);
     2742            spanData.setup(qwsServer->backgroundBrush(), 256, QPainter::CompositionMode_Source);
    27432743            spanData.dx = off.x();
    27442744            spanData.dy = off.y();

  • trunk/src/gui/embedded/qscreenqnx_qws.cpp

    r651 r769  
    206206                GF_FORMAT_ARGB8888, 0,
    207207                GF_SURFACE_CREATE_CPU_FAST_ACCESS | GF_SURFACE_CREATE_CPU_LINEAR_ACCESSIBLE
    208                 | GF_SURFACE_PHYS_CONTIG);
     208                | GF_SURFACE_PHYS_CONTIG | GF_SURFACE_CREATE_SHAREABLE);
    209209    if (ret != GF_ERR_OK) {
    210210        qWarning("QQnxScreen: gf_surface_create(%dx%d) failed with error code %d",
Note: See TracChangeset for help on using the changeset viewer.