1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid warnings about an unreachable code

Browse Source 
Change-Id: I57c2967db4c1bd2c39ecb3eac9b18eb7455c6a50
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2012-10-08 18:20:50 +03:00 committed by The Qt Project
parent 06332df743
commit 34c31cd74c
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/codecs/qtextcodec.cpp
View File

@ -583,9 +583,9 @@ QTextCodec* QTextCodec::codecForMib(int mib)
#ifdef QT_USE_ICU #ifdef QT_USE_ICU
return QIcuCodec::codecForMibUnlocked(mib); return QIcuCodec::codecForMibUnlocked(mib);
#endif #else
return 0; return 0;
#endif
} }
/*! /*!

3
src/corelib/global/qlibraryinfo.cpp
View File

@ -250,8 +250,9 @@ QLibraryInfo::isDebugBuild()
{ {
#ifdef QT_DEBUG #ifdef QT_DEBUG
return true; return true;
#endif #else
return false; return false;
#endif
} }
#endif // QT_BOOTSTRAPPED #endif // QT_BOOTSTRAPPED

5
src/gui/painting/qtextureglyphcache.cpp
View File

@ -275,10 +275,7 @@ QImage QTextureGlyphCache::textureMapForGlyph(glyph_t g, QFixed subPixelPosition
{ {
if (m_type == QFontEngineGlyphCache::Raster_RGBMask) if (m_type == QFontEngineGlyphCache::Raster_RGBMask)
return m_current_fontengine->alphaRGBMapForGlyph(g, subPixelPosition, m_transform); return m_current_fontengine->alphaRGBMapForGlyph(g, subPixelPosition, m_transform);
else return m_current_fontengine->alphaMapForGlyph(g, subPixelPosition, m_transform);
return m_current_fontengine->alphaMapForGlyph(g, subPixelPosition, m_transform);
return QImage();
} }
/************************************************************************ /************************************************************************

1
src/widgets/kernel/qapplication_qpa.cpp
View File

@ -387,7 +387,6 @@ bool QApplication::isEffectEnabled(Qt::UIEffect effect)
return QColormap::instance().depth() >= 16 return QColormap::instance().depth() >= 16
&& (QApplicationPrivate::enabledAnimations & QPlatformTheme::GeneralUiEffect) && (QApplicationPrivate::enabledAnimations & QPlatformTheme::GeneralUiEffect)
&& (QApplicationPrivate::enabledAnimations & uiEffectToFlag(effect)); && (QApplicationPrivate::enabledAnimations & uiEffectToFlag(effect));
return false;
} }
QWidget *QApplication::topLevelAt(const QPoint &pos) QWidget *QApplication::topLevelAt(const QPoint &pos)