diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-08 00:00:10 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-08 00:00:10 (GMT) |
| commit | c3ac16c8604250628255bc549bee89c289733d0a (patch) | |
| tree | 2db69ffe7f0f02386d7b670b506179d2b6b9e009 | |
| parent | ef2dc6d122a03a94da273cbbf09e8f7aec2b4f6e (diff) | |
| parent | 71f8955e0a2744bccff94495c4db5e054db8ab95 (diff) | |
| download | Qt-c3ac16c8604250628255bc549bee89c289733d0a.zip Qt-c3ac16c8604250628255bc549bee89c289733d0a.tar.gz Qt-c3ac16c8604250628255bc549bee89c289733d0a.tar.bz2 | |
Merge branch 'master-upstream' into master-water
| -rw-r--r-- | mkspecs/cygwin-g++/qmake.conf | 3 | ||||
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qgl_p.h | 1 | ||||
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 21 |
4 files changed, 24 insertions, 3 deletions
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index ddfceb0..c46384f 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf @@ -68,6 +68,9 @@ QMAKE_LIBS_X11SM = -lSM -lICE QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread +QMAKE_PREFIX_SHLIB = lib +QMAKE_PREFIX_STATICLIB = lib +QMAKE_EXTENSION_STATICLIB = a QMAKE_MOC = $$[QT_INSTALL_BINS]/moc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic 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; |