diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-10-08 18:20:50 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 13:24:17 +0200 |
| commit | 34c31cd74cde7a1c36f3603a625fb0d28c259a6e (patch) | |
| tree | 64fafbc160b5a32ffafdca035932d83098f21701 | |
| parent | 06332df7438c8d2215b02f1e01ce2ed28a49a320 (diff) | |
Avoid warnings about an unreachable code
Change-Id: I57c2967db4c1bd2c39ecb3eac9b18eb7455c6a50
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 3 | ||||
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/kernel/qapplication_qpa.cpp | 1 |
4 files changed, 5 insertions, 8 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 203560d370..d42d29d55a 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -583,9 +583,9 @@ QTextCodec* QTextCodec::codecForMib(int mib) #ifdef QT_USE_ICU return QIcuCodec::codecForMibUnlocked(mib); -#endif - +#else return 0; +#endif } /*! diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 3f01425570..ccf071826a 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -250,8 +250,9 @@ QLibraryInfo::isDebugBuild() { #ifdef QT_DEBUG return true; -#endif +#else return false; +#endif } #endif // QT_BOOTSTRAPPED diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index ed0e92ecea..43243b7c34 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -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); } /************************************************************************ diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp index 62e4904005..6b04c18b9d 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -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) |