Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Revert "QSystemTrayIcon::messageTimeout() signal implemented"
  print out which GLSL shader that failed compilation for better debugging
  QSystemTrayIcon::messageTimeout() signal implemented
  --warn
  compile with debug defined enabled

3 files changed, 21 insertions, 3 deletions

diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index de59524..f3e5d22 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -445,7 +445,7 @@ void QImageTextureGlyphCache::fillTexture(const Coord &c, glyph_t g, QFixed subP
     QPoint base(c.x + glyphMargin(), c.y + glyphMargin() + c.baseLineY-1);
     if (m_image.rect().contains(base))
         m_image.setPixel(base, 255);
-    m_image.save(QString::fromLatin1("cache-%1.png").arg(int(this)));
+    m_image.save(QString::fromLatin1("cache-%1.png").arg(qint64(this)));
 #endif
 }
 
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 547e457..a32a311 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -509,6 +509,7 @@ Q_SIGNALS:
 
 private slots:
     void freeTexture_slot(QGLContext *context, QPixmapData *boundPixmap, GLuint id) {
+        Q_UNUSED(boundPixmap);
 #if defined(Q_WS_X11)
         if (boundPixmap) {
             QGLContext *oldContext = const_cast<QGLContext *>(QGLContext::currentContext());
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 74382b0..1f39884 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -260,10 +260,27 @@ bool QGLShaderPrivate::compile(QGLShader *q)
         glGetShaderInfoLog(shader, value, &len, logbuf);
         log = QString::fromLatin1(logbuf);
         QString name = q->objectName();
+
+        char *types[] = {
+            "Fragment",
+            "Vertex",
+            "Geometry",
+            ""
+        };
+
+        char *type = types[3];
+        if (shaderType == QGLShader::Fragment)
+            type = types[0];
+        else if (shaderType == QGLShader::Vertex)
+            type = types[1];
+        else if (shaderType == QGLShader::Geometry)
+            type = types[2];
+
         if (name.isEmpty())
-            qWarning() << "QGLShader::compile:" << log;
+            qWarning("QGLShader::compile(%s): %s", type, qPrintable(log));
         else
-            qWarning() << "QGLShader::compile[" << name << "]:" << log;
+            qWarning("QGLShader::compile(%s)[%s]: %s", type, qPrintable(name), qPrintable(log));
+
         delete [] logbuf;
     }
     return compiled;