summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/opengl/qopenglprogrambinarycache.cpp2
-rw-r--r--src/gui/util/qtexturefiledata.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp
index d16173df83..f2d093ebed 100644
--- a/src/gui/opengl/qopenglprogrambinarycache.cpp
+++ b/src/gui/opengl/qopenglprogrambinarycache.cpp
@@ -62,6 +62,7 @@ const quint32 BINSHADER_MAGIC = 0x5174;
const quint32 BINSHADER_VERSION = 0x2;
const quint32 BINSHADER_QTVERSION = QT_VERSION;
+namespace {
struct GLEnvInfo
{
GLEnvInfo();
@@ -70,6 +71,7 @@ struct GLEnvInfo
QByteArray glrenderer;
QByteArray glversion;
};
+}
GLEnvInfo::GLEnvInfo()
{
diff --git a/src/gui/util/qtexturefiledata.cpp b/src/gui/util/qtexturefiledata.cpp
index f9129e86c2..ae230800c0 100644
--- a/src/gui/util/qtexturefiledata.cpp
+++ b/src/gui/util/qtexturefiledata.cpp
@@ -244,7 +244,7 @@ void QTextureFileData::setLogName(const QByteArray &name)
d->logName = name;
}
-QByteArray glFormatName(quint32 fmt)
+static QByteArray glFormatName(quint32 fmt)
{
const char *id = 0;
#if QT_CONFIG(opengl)