summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-09-30 13:55:29 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-10-01 08:29:27 (GMT)
commitd6cb9ed0b44118c7f9045559a300ea14985f0103 (patch)
tree998dc714d8efaa4e2b5e3a19acac441546c2259f /src
parent9c0b1db38f7ad8b6b0d51410033854be72146e74 (diff)
downloadQt-d6cb9ed0b44118c7f9045559a300ea14985f0103.zip
Qt-d6cb9ed0b44118c7f9045559a300ea14985f0103.tar.gz
Qt-d6cb9ed0b44118c7f9045559a300ea14985f0103.tar.bz2
Fix warnings on mingw
Reviewed-by: trust me
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qsoftkeymanager.cpp1
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp1
-rw-r--r--src/svg/qsvghandler.cpp2
-rw-r--r--src/xmlpatterns/functions/qsequencefns_p.h4
4 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 45695d9..265f971 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -121,6 +121,7 @@ QAction *QSoftKeyManager::createAction(StandardSoftKey standardKey, QWidget *act
softKeyRole = QAction::PositiveSoftKey;
break;
case CancelSoftKey:
+ default:
softKeyRole = QAction::NegativeSoftKey;
break;
}
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 7e45fd9..f612bc0 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1452,6 +1452,7 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
#if !defined(QT_OPENGL_ES_2)
bool success = qt_resolve_version_2_0_functions(d->ctx);
Q_ASSERT(success);
+ Q_UNUSED(success);
#endif
d->shaderManager = new QGLEngineShaderManager(d->ctx);
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index a6e4855..6d2a0f9 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -3551,6 +3551,8 @@ void QSvgHandler::parse()
case QXmlStreamReader::ProcessingInstruction:
processingInstruction(xml->processingInstructionTarget().toString(), xml->processingInstructionData().toString());
break;
+ default:
+ break;
}
}
resolveGradients(m_doc);
diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h
index a9a1765..e406b95 100644
--- a/src/xmlpatterns/functions/qsequencefns_p.h
+++ b/src/xmlpatterns/functions/qsequencefns_p.h
@@ -148,8 +148,8 @@ namespace QPatternist
{
// RVCT doesn't like using template parameter in trinary operator when the trinary operator result is
// passed directly into another constructor.
- bool tempAssert = (Id == IDExistsFN || Id == IDEmptyFN);
- Q_ASSERT(tempAssert);
+ Q_ASSERT(Id == IDExistsFN || Id == IDEmptyFN);
+
const Expression::Ptr me(FunctionCall::compress(context));