Changeset 846 for trunk/src/gui/painting/qpainter.h

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/painting/qpainter.h (modified) (6 diffs)

trunk/src/gui/painting/qpainter.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -79 +79 @@
 class QMatrix;
 class QTransform;
+
 
 class QPainterPrivateDeleter;
@@ -98 +99 @@
 
     Q_DECLARE_FLAGS(RenderHints, RenderHint)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     QPainter();
@@ -351 +375 @@
     inline void drawPixmap(const QRect &r, const QPixmap &pm);
     inline void drawPixmap(int x, int y, int w, int h, const QPixmap &pm);
+
+
+
 
     void drawImage(const QRectF &targetRect, const QImage &image, const QRectF &sourceRect,
@@ -369 +396 @@
     void setLayoutDirection(Qt::LayoutDirection direction);
     Qt::LayoutDirection layoutDirection() const;
+
+
+
+
 
     void drawText(const QPointF &p, const QString &s);
@@ -897 +928 @@
 }
 
+
+
+
+
+
+
+
+
+
+
 inline void QPainter::drawTextItem(const QPoint &p, const QTextItem &ti)
 {