Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

15 files changed, 223 insertions, 37 deletions

diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 050c997..2aec40f 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -1510,7 +1510,7 @@ QString QTextDecoder::toUnicode(const QByteArray &ba)
     cannot be detected from the content provided, \a defaultCodec is
     returned.
 
-    \sa codecForUtfText
+    \sa codecForUtfText()
 */
 QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba, QTextCodec *defaultCodec)
 {
@@ -1556,7 +1556,7 @@ QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba)
     cannot be detected from the content provided, \a defaultCodec is
     returned.
 
-    \sa codecForHtml
+    \sa codecForHtml()
 */
 QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba, QTextCodec *defaultCodec)
 {
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 854d0aa..ea93764 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -217,7 +217,7 @@ struct QTexturedBrushData : public QBrushData
 
 // returns true if the brush has a pixmap (or bitmap) set as the
 // brush texture, false otherwise
-bool qHasPixmapTexture(const QBrush& brush)
+bool Q_GUI_EXPORT qHasPixmapTexture(const QBrush& brush)
 {
     if (brush.style() != Qt::TexturePattern)
         return false;
diff --git a/src/gui/painting/qdrawutil.h b/src/gui/painting/qdrawutil.h
index 38d9ec0..306f4e2 100644
--- a/src/gui/painting/qdrawutil.h
+++ b/src/gui/painting/qdrawutil.h
@@ -161,10 +161,18 @@ struct Q_GUI_EXPORT QTileRules
     Qt::TileRule vertical;
 };
 
-Q_GUI_EXPORT void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargins &targetMargins, const QPixmap &pixmap,
-                                    const QRect &sourceRect, const QMargins &sourceMargins, const QTileRules &rules = QTileRules());
-
-Q_GUI_EXPORT inline void qDrawBorderPixmap(QPainter *painter, const QRect &target, const QMargins &margins, const QPixmap &pixmap)
+Q_GUI_EXPORT void qDrawBorderPixmap(QPainter *painter, 
+                                    const QRect &targetRect, 
+                                    const QMargins &targetMargins, 
+                                    const QPixmap &pixmap,
+                                    const QRect &sourceRect, 
+                                    const QMargins &sourceMargins, 
+                                    const QTileRules &rules = QTileRules());
+
+Q_GUI_EXPORT inline void qDrawBorderPixmap(QPainter *painter, 
+                                           const QRect &target, 
+                                           const QMargins &margins, 
+                                           const QPixmap &pixmap)
 {
     qDrawBorderPixmap(painter, target, margins, pixmap, pixmap.rect(), margins);
 }
diff --git a/src/gui/widgets/qbuttongroup.cpp b/src/gui/widgets/qbuttongroup.cpp
index ebfafe3..1003523 100644
--- a/src/gui/widgets/qbuttongroup.cpp
+++ b/src/gui/widgets/qbuttongroup.cpp
@@ -178,10 +178,11 @@
 /*!
     \fn void QButtonGroup::addButton(QAbstractButton *button);
 
-    Adds the given \a button to the end of the group's internal list of buttons.
-    An \a id will be assigned to the button by this QButtonGroup. Automatically
-    assigned ids are guaranteed to be negative, starting with -2. If you are also
-    assigning your own ids, use positive values to avoid conflicts.
+    Adds the given \a button to the end of the group's internal list
+    of buttons.  An id will be assigned to the button by this
+    QButtonGroup. Automatically assigned ids are guaranteed to be
+    negative, starting with -2. If you are also assigning your own
+    ids, use positive values to avoid conflicts.
 
     \sa removeButton() buttons()
 */
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index 49ce5a3..711de24 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -1413,6 +1413,7 @@ QString QHttpRequestHeader::toString() const
  ****************************************************/
 /*!
     \class QHttp
+    \obsolete
     \reentrant
 
     \brief The QHttp class provides an implementation of the HTTP protocol.
@@ -1422,10 +1423,11 @@ QString QHttpRequestHeader::toString() const
     \mainclass
 
     This class provides a direct interface to HTTP that allows you to
-    have more control over the requests and that allows you to access
-    the response header fields. However, for new applications, it is
+    download and upload data with the HTTP protocol.
+    However, for new applications, it is
     recommended to use QNetworkAccessManager and QNetworkReply, as
-    those classes possess a simpler, yet more powerful API.
+    those classes possess a simpler, yet more powerful API
+    and a more modern protocol implementation.
 
     The class works asynchronously, so there are no blocking
     functions. If an operation cannot be executed immediately, the
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index 5c541d0..b71c4c1 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -107,9 +107,11 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
         code[MainFragmentShader] = qglslMainFragmentShader;
 
         code[ImageSrcFragmentShader] = qglslImageSrcFragmentShader;
+        code[ImageSrcWithPatternFragmentShader] = qglslImageSrcWithPatternFragmentShader;
         code[NonPremultipliedImageSrcFragmentShader] = qglslNonPremultipliedImageSrcFragmentShader;
         code[SolidBrushSrcFragmentShader] = qglslSolidBrushSrcFragmentShader;
         code[TextureBrushSrcFragmentShader] = qglslTextureBrushSrcFragmentShader;
+        code[TextureBrushSrcWithPatternFragmentShader] = qglslTextureBrushSrcWithPatternFragmentShader;
         code[PatternBrushSrcFragmentShader] = qglslPatternBrushSrcFragmentShader;
         code[LinearGradientBrushSrcFragmentShader] = qglslLinearGradientBrushSrcFragmentShader;
         code[RadialGradientBrushSrcFragmentShader] = qglslRadialGradientBrushSrcFragmentShader;
@@ -296,6 +298,15 @@ bool QGLEngineShaderManager::useCorrectShaderProg()
             srcPixelFragShaderName = ImageSrcFragmentShader;
             positionVertexShaderName = PositionOnlyVertexShader;
             break;
+        case QGLEngineShaderManager::PatternSrc:
+            srcPixelFragShaderName = ImageSrcWithPatternFragmentShader;
+            positionVertexShaderName = PositionOnlyVertexShader;
+            break;
+        case QGLEngineShaderManager::TextureSrcWithPattern:
+            srcPixelFragShaderName = TextureBrushSrcWithPatternFragmentShader;
+            positionVertexShaderName = isAffine ? AffinePositionWithTextureBrushVertexShader
+                                                : PositionWithTextureBrushVertexShader;
+            break;
         case QGLEngineShaderManager::NonPremultipliedImageSrc:
             srcPixelFragShaderName = NonPremultipliedImageSrcFragmentShader;
             positionVertexShaderName = PositionOnlyVertexShader;
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index afbc918..4a55eca 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -129,9 +129,11 @@
 
     Brushes & image drawing are implementations of "qcolorp vec4 srcPixel()":
         qglslImageSrcFragShader
+        qglslImageSrcWithPatternFragShader
         qglslNonPremultipliedImageSrcFragShader
         qglslSolidBrushSrcFragShader
         qglslTextureBrushSrcFragShader
+        qglslTextureBrushWithPatternFragShader
         qglslPatternBrushSrcFragShader
         qglslLinearGradientBrushSrcFragShader
         qglslRadialGradientBrushSrcFragShader
@@ -265,7 +267,9 @@ public:
     enum MaskType {NoMask, PixelMask, SubPixelMask, SubPixelWithGammaMask};
     enum PixelSrcType {
         ImageSrc = Qt::TexturePattern+1,
-        NonPremultipliedImageSrc = Qt::TexturePattern+2
+        NonPremultipliedImageSrc = Qt::TexturePattern+2,
+        PatternSrc = Qt::TexturePattern+3,
+        TextureSrcWithPattern = Qt::TexturePattern+4
     };
 
     // There are optimisations we can do, depending on the brush transform:
@@ -313,9 +317,11 @@ public:
         MainFragmentShader,
 
         ImageSrcFragmentShader,
+        ImageSrcWithPatternFragmentShader,
         NonPremultipliedImageSrcFragmentShader,
         SolidBrushSrcFragmentShader,
         TextureBrushSrcFragmentShader,
+        TextureBrushSrcWithPatternFragmentShader,
         PatternBrushSrcFragmentShader,
         LinearGradientBrushSrcFragmentShader,
         RadialGradientBrushSrcFragmentShader,
diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
index 70cc67e..61cc63e 100644
--- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
@@ -130,7 +130,7 @@ static const char* const qglslPatternBrushSrcFragmentShader = "\
     uniform lowp    vec4      patternColor; \
     varying mediump vec2      patternTexCoords;\
     lowp vec4 srcPixel() { \
-        return patternColor * texture2D(brushTexture, patternTexCoords).r; \
+        return patternColor * (1.0 - texture2D(brushTexture, patternTexCoords).r); \
     }\n";
 
 
@@ -278,6 +278,13 @@ static const char* const qglslTextureBrushSrcFragmentShader = "\
         return texture2D(brushTexture, brushTextureCoords); \
     }";
 
+static const char* const qglslTextureBrushSrcWithPatternFragmentShader = "\
+    varying mediump vec2      brushTextureCoords; \
+    uniform lowp    vec4      patternColor; \
+    uniform         sampler2D brushTexture; \
+    lowp vec4 srcPixel() { \
+        return patternColor * (1.0 - texture2D(brushTexture, brushTextureCoords).r); \
+    }";
 
 // Solid Fill Brush
 static const char* const qglslSolidBrushSrcFragmentShader = "\
@@ -293,6 +300,14 @@ static const char* const qglslImageSrcFragmentShader = "\
         return texture2D(imageTexture, textureCoords); \
     }";
 
+static const char* const qglslImageSrcWithPatternFragmentShader = "\
+    varying highp vec2      textureCoords; \
+    uniform lowp  vec4      patternColor; \
+    uniform       sampler2D imageTexture; \
+    lowp vec4 srcPixel() { \
+        return patternColor * (1.0 - texture2D(imageTexture, textureCoords).r); \
+    }\n";
+
 static const char* const qglslNonPremultipliedImageSrcFragmentShader = "\
     varying highp vec2      textureCoords; \
     uniform       sampler2D imageTexture; \
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index bdea187..d1c6e9f 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -279,7 +279,13 @@ void QGL2PaintEngineExPrivate::setBrush(const QBrush* brush)
     currentBrush = brush;
     brushTextureDirty = true;
     brushUniformsDirty = true;
-    shaderManager->setSrcPixelType(currentBrush->style());
+    if (currentBrush->style() == Qt::TexturePattern
+        && qHasPixmapTexture(*brush) && brush->texture().isQBitmap())
+    {
+        shaderManager->setSrcPixelType(QGLEngineShaderManager::TextureSrcWithPattern);
+    } else {
+        shaderManager->setSrcPixelType(currentBrush->style());
+    }
     shaderManager->optimiseForBrushTransform(currentBrush->transform());
 }
 
@@ -314,7 +320,7 @@ void QGL2PaintEngineExPrivate::updateBrushTexture()
 
     if ( (style >= Qt::Dense1Pattern) && (style <= Qt::DiagCrossPattern) ) {
         // Get the image data for the pattern
-        QImage texImage = qt_imageForBrush(style, true);
+        QImage texImage = qt_imageForBrush(style, false);
 
         glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT);
         ctx->d_func()->bindTexture(texImage, GL_TEXTURE_2D, GL_RGBA, true);
@@ -432,6 +438,11 @@ void QGL2PaintEngineExPrivate::updateBrushUniforms()
 
             const QPixmap& texPixmap = currentBrush->texture();
 
+            if (qHasPixmapTexture(*currentBrush) && currentBrush->texture().isQBitmap()) {
+                QColor col = premultiplyColor(currentBrush->color(), (GLfloat)q->state()->opacity);
+                shaderManager->currentProgram()->setUniformValue("patternColor", col);
+            }
+
             QSizeF invertedTextureSize( 1.0 / texPixmap.width(), 1.0 / texPixmap.height() );
             shaderManager->currentProgram()->setUniformValue("invertedTextureSize", invertedTextureSize);
 
@@ -578,17 +589,22 @@ static inline void setCoords(GLfloat *coords, const QGLRect &rect)
     coords[7] = rect.bottom;
 }
 
-void QGL2PaintEngineExPrivate::drawTexture(const QGLRect& dest, const QGLRect& src, const QSize &textureSize, bool opaque)
+void QGL2PaintEngineExPrivate::drawTexture(const QGLRect& dest, const QGLRect& src, const QSize &textureSize, bool opaque, bool pattern)
 {
     transferMode(ImageDrawingMode);
 
     updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, q->state()->renderHints & QPainter::SmoothPixmapTransform);
 
     // Setup for texture drawing
-    shaderManager->setSrcPixelType(QGLEngineShaderManager::ImageSrc);
+    shaderManager->setSrcPixelType(pattern ? QGLEngineShaderManager::PatternSrc : QGLEngineShaderManager::ImageSrc);
     shaderManager->setTextureCoordsEnabled(true);
     prepareForDraw(opaque);
 
+    if (pattern) {
+        QColor col = premultiplyColor(q->state()->pen.color(), (GLfloat)q->state()->opacity);
+        shaderManager->currentProgram()->setUniformValue("patternColor", col);
+    }
+
     shaderManager->currentProgram()->setUniformValue("imageTexture", QT_IMAGE_TEXTURE_UNIT);
 
     GLfloat dx = 1.0 / textureSize.width();
@@ -987,7 +1003,7 @@ void QGL2PaintEngineEx::drawPixmap(const QRectF& dest, const QPixmap & pixmap, c
     ctx->d_func()->bindTexture(pixmap, GL_TEXTURE_2D, GL_RGBA, true);
 
     //FIXME: we should use hasAlpha() instead, but that's SLOW at the moment
-    d->drawTexture(dest, src, pixmap.size(), !pixmap.hasAlphaChannel());
+    d->drawTexture(dest, src, pixmap.size(), !pixmap.hasAlphaChannel(), pixmap.depth() == 1);
 }
 
 void QGL2PaintEngineEx::drawImage(const QRectF& dest, const QImage& image, const QRectF& src,
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index db39ced..8a50096 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -165,7 +165,7 @@ public:
     // fill, drawOutline, drawTexture & drawCachedGlyphs are the rendering entry points:
     void fill(const QVectorPath &path);
     void drawOutline(const QVectorPath& path);
-    void drawTexture(const QGLRect& dest, const QGLRect& src, const QSize &textureSize, bool opaque);
+    void drawTexture(const QGLRect& dest, const QGLRect& src, const QSize &textureSize, bool opaque, bool pattern = false);
     void drawCachedGlyphs(const QPointF &p, const QTextItemInt &ti);
 
     void drawVertexArrays(QGL2PEXVertexArray& vertexArray, GLenum primitive);
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index 98c406b..4c53c46 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -104,6 +104,7 @@ QGLPixmapData::QGLPixmapData(PixelType type)
     , m_ctx(0)
     , m_dirty(false)
     , m_hasFillColor(false)
+    , m_hasAlpha(false)
 {
     setSerialNumber(++qt_gl_pixmap_serial);
 }
@@ -136,6 +137,11 @@ void QGLPixmapData::resize(int width, int height)
     if (width == m_width && height == m_height)
         return;
 
+    if (width <= 0 || height <= 0) {
+        width = 0;
+        height = 0;
+    }
+
     m_width = width;
     m_height = height;
 
@@ -166,7 +172,8 @@ void QGLPixmapData::ensureCreated() const
     if (!m_textureId) {
         glGenTextures(1, &m_textureId);
         glBindTexture(target, m_textureId);
-        glTexImage2D(target, 0, GL_RGBA, m_width, m_height, 0,
+        GLenum format = m_hasAlpha ? GL_RGBA : GL_RGB;
+        glTexImage2D(target, 0, format, m_width, m_height, 0,
                 GL_RGBA, GL_UNSIGNED_BYTE, 0);
         glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
         glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -195,10 +202,20 @@ void QGLPixmapData::fromImage(const QImage &image,
     if (image.size() == QSize(m_width, m_height))
         setSerialNumber(++qt_gl_pixmap_serial);
     resize(image.width(), image.height());
-    m_source = image;
+
+    if (pixelType() == BitmapType) {
+        m_source = image.convertToFormat(QImage::Format_MonoLSB);
+    } else {
+        m_source = image.hasAlphaChannel()
+            ? image.convertToFormat(QImage::Format_ARGB32_Premultiplied)
+            : image.convertToFormat(QImage::Format_RGB32);
+    }
+
     m_dirty = true;
     m_hasFillColor = false;
 
+    m_hasAlpha = image.hasAlphaChannel();
+
     if (m_textureId) {
         QGLShareContextScope ctx(qt_gl_share_widget()->context());
         glDeleteTextures(1, &m_textureId);
@@ -230,24 +247,46 @@ void QGLPixmapData::fill(const QColor &color)
     if (!isValid())
         return;
 
+    if (!m_textureId)
+        m_hasAlpha = color.alpha() != 255;
+
     if (useFramebufferObjects()) {
         m_source = QImage();
         m_hasFillColor = true;
         m_fillColor = color;
-    } else if (!m_source.isNull()) {
-        m_source.fill(PREMUL(color.rgba()));
     } else {
-        // ## TODO: improve performance here
-        QImage img(m_width, m_height, QImage::Format_ARGB32_Premultiplied);
-        img.fill(PREMUL(color.rgba()));
-
-        fromImage(img, 0);
+        QImage image = fillImage(color);
+        fromImage(image, 0);
     }
 }
 
 bool QGLPixmapData::hasAlphaChannel() const
 {
-    return true;
+    return pixelType() == BitmapType || m_hasAlpha;
+}
+
+QImage QGLPixmapData::fillImage(const QColor &color) const
+{
+    QImage img;
+    if (pixelType() == BitmapType) {
+        img = QImage(m_width, m_height, QImage::Format_MonoLSB);
+        img.setNumColors(2);
+        img.setColor(0, QColor(Qt::color0).rgba());
+        img.setColor(1, QColor(Qt::color1).rgba());
+
+        int gray = qGray(color.rgba());
+        if (qAbs(255 - gray) < gray)
+            img.fill(0);
+        else
+            img.fill(1);
+    } else {
+        img = QImage(m_width, m_height,
+                m_hasAlpha
+                ? QImage::Format_ARGB32_Premultiplied
+                : QImage::Format_RGB32);
+        img.fill(PREMUL(color.rgba()));
+    }
+    return img;
 }
 
 QImage QGLPixmapData::toImage() const
@@ -260,10 +299,7 @@ QImage QGLPixmapData::toImage() const
     } else if (!m_source.isNull()) {
         return m_source;
     } else if (m_dirty || m_hasFillColor) {
-        QImage img(m_width, m_height, QImage::Format_ARGB32_Premultiplied);
-        if (m_hasFillColor)
-            img.fill(PREMUL(m_fillColor.rgba()));
-        return img;
+        return fillImage(m_fillColor);
     } else {
         ensureCreated();
     }
@@ -453,6 +489,9 @@ extern int qt_defaultDpiY();
 
 int QGLPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
 {
+    if (m_width == 0)
+        return 0;
+
     switch (metric) {
     case QPaintDevice::PdmWidth:
         return m_width;
diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h
index 1b6b7ae..af10f2c 100644
--- a/src/opengl/qpixmapdata_gl_p.h
+++ b/src/opengl/qpixmapdata_gl_p.h
@@ -115,6 +115,8 @@ private:
 
     static bool useFramebufferObjects();
 
+    QImage fillImage(const QColor &color) const;
+
     int m_width;
     int m_height;
 
@@ -131,6 +133,8 @@ private:
     // represented by a single fill color
     mutable QColor m_fillColor;
     mutable bool m_hasFillColor;
+
+    mutable bool m_hasAlpha;
 };
 
 QT_END_NAMESPACE
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index 965c7a5..01974a2 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -272,6 +272,24 @@ QGLWindowSurface::~QGLWindowSurface()
     delete d_ptr;
 }
 
+void QGLWindowSurface::deleted(QObject *object)
+{
+    QWidget *widget = qobject_cast<QWidget *>(object);
+    if (widget) {
+        QWidgetPrivate *widgetPrivate = widget->d_func();
+        if (widgetPrivate->extraData()) {
+            union { QGLContext **ctxPtr; void **voidPtr; };
+            voidPtr = &widgetPrivate->extraData()->glContext;
+            int index = d_ptr->contexts.indexOf(ctxPtr);
+            if (index != -1) {
+                delete *ctxPtr;
+                *ctxPtr = 0;
+                d_ptr->contexts.removeAt(index);
+            }
+        }
+    }
+}
+
 void QGLWindowSurface::hijackWindow(QWidget *widget)
 {
     QWidgetPrivate *widgetPrivate = widget->d_func();
@@ -288,6 +306,8 @@ void QGLWindowSurface::hijackWindow(QWidget *widget)
 
     union { QGLContext **ctxPtr; void **voidPtr; };
 
+    connect(widget, SIGNAL(destroyed(QObject *)), this, SLOT(deleted(QObject *)));
+
     voidPtr = &widgetPrivate->extraData()->glContext;
     d_ptr->contexts << ctxPtr;
     qDebug() << "hijackWindow() context created for" << widget << d_ptr->contexts.size();
diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h
index d47e3e3..9efd1ae 100644
--- a/src/opengl/qwindowsurface_gl_p.h
+++ b/src/opengl/qwindowsurface_gl_p.h
@@ -65,8 +65,9 @@ class QRegion;
 class QWidget;
 struct QGLWindowSurfacePrivate;
 
-class QGLWindowSurface : public QWindowSurface, public QPaintDevice
+class QGLWindowSurface : public QObject, public QWindowSurface, public QPaintDevice
 {
+    Q_OBJECT
 public:
     QGLWindowSurface(QWidget *window);
     ~QGLWindowSurface();
@@ -91,6 +92,9 @@ public:
 protected:
     int metric(PaintDeviceMetric metric) const;
 
+private slots:
+    void deleted(QObject *object);
+
 private:
     void hijackWindow(QWidget *widget);
 
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index 540389b..783b83d 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.cpp
@@ -46,6 +46,66 @@
 
 QT_BEGIN_NAMESPACE
 
+/*! \enum QTest::AttributeIndex
+  This enum numbers the different tests.
+
+  \value AI_Undefined
+        
+  \value AI_Name
+        
+  \value AI_Result
+        
+  \value AI_Tests
+        
+  \value AI_Failures
+        
+  \value AI_Errors
+        
+  \value AI_Type
+        
+  \value AI_Description
+        
+  \value AI_PropertyValue
+        
+  \value AI_QTestVersion
+        
+  \value AI_QtVersion
+        
+  \value AI_File
+        
+  \value AI_Line
+        
+  \value AI_Metric
+        
+  \value AI_Tag
+        
+  \value AI_Value
+        
+  \value AI_Iterations
+*/
+
+/*! \enum QTest::LogElementType
+  The enum specifies the kinds of test log messages.
+
+  \value LET_Undefined
+
+  \value LET_Property
+
+  \value LET_Properties
+
+  \value LET_Failure
+
+  \value LET_Error
+
+  \value LET_TestCase
+
+  \value LET_TestSuite
+
+  \value LET_Benchmark
+
+  \value LET_SystemError
+*/
+
 QTestElementAttribute::QTestElementAttribute()
     :attributeValue(0),
     attributeIndex(QTest::AI_Undefined)