Avoid warnings about an unreachable code
Change-Id: I57c2967db4c1bd2c39ecb3eac9b18eb7455c6a50 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
parent
06332df743
commit
34c31cd74c
@ -583,9 +583,9 @@ QTextCodec* QTextCodec::codecForMib(int mib)
|
||||
|
||||
#ifdef QT_USE_ICU
|
||||
return QIcuCodec::codecForMibUnlocked(mib);
|
||||
#endif
|
||||
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -250,8 +250,9 @@ QLibraryInfo::isDebugBuild()
|
||||
{
|
||||
#ifdef QT_DEBUG
|
||||
return true;
|
||||
#endif
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif // QT_BOOTSTRAPPED
|
||||
|
@ -275,10 +275,7 @@ QImage QTextureGlyphCache::textureMapForGlyph(glyph_t g, QFixed subPixelPosition
|
||||
{
|
||||
if (m_type == QFontEngineGlyphCache::Raster_RGBMask)
|
||||
return m_current_fontengine->alphaRGBMapForGlyph(g, subPixelPosition, m_transform);
|
||||
else
|
||||
return m_current_fontengine->alphaMapForGlyph(g, subPixelPosition, m_transform);
|
||||
|
||||
return QImage();
|
||||
return m_current_fontengine->alphaMapForGlyph(g, subPixelPosition, m_transform);
|
||||
}
|
||||
|
||||
/************************************************************************
|
||||
|
@ -387,7 +387,6 @@ bool QApplication::isEffectEnabled(Qt::UIEffect effect)
|
||||
return QColormap::instance().depth() >= 16
|
||||
&& (QApplicationPrivate::enabledAnimations & QPlatformTheme::GeneralUiEffect)
|
||||
&& (QApplicationPrivate::enabledAnimations & uiEffectToFlag(effect));
|
||||
return false;
|
||||
}
|
||||
|
||||
QWidget *QApplication::topLevelAt(const QPoint &pos)
|
||||
|
Loading…
Reference in New Issue
Block a user