diff options
| author | David Faure <faure@kde.org> | 2009-10-07 09:20:23 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-07 09:20:23 (GMT) |
| commit | ed9fb96a626c284cebd4fcd9a2e00f32e202099a (patch) | |
| tree | fafee1cf1243f1968c2bb835b75dcaf68692adeb /src/gui | |
| parent | 1433798228fd3d1b67b83adfdd72e53884a5c2a0 (diff) | |
| download | Qt-ed9fb96a626c284cebd4fcd9a2e00f32e202099a.zip Qt-ed9fb96a626c284cebd4fcd9a2e00f32e202099a.tar.gz Qt-ed9fb96a626c284cebd4fcd9a2e00f32e202099a.tar.bz2 | |
Fix compilation with -pedantic
Merge-request: 1716
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/effects/qgraphicseffect.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_p.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp index e971fd8..ee01fdc 100644 --- a/src/gui/effects/qgraphicseffect.cpp +++ b/src/gui/effects/qgraphicseffect.cpp @@ -566,7 +566,7 @@ QGraphicsColorizeEffect::~QGraphicsColorizeEffect() \brief the color of the effect. By default, the color is light blue (QColor(0, 0, 192)). -*/; +*/ QColor QGraphicsColorizeEffect::color() const { Q_D(const QGraphicsColorizeEffect); diff --git a/src/gui/kernel/qsoftkeymanager_p.h b/src/gui/kernel/qsoftkeymanager_p.h index c4bb84d..b455445 100644 --- a/src/gui/kernel/qsoftkeymanager_p.h +++ b/src/gui/kernel/qsoftkeymanager_p.h @@ -74,7 +74,7 @@ public: SelectSoftKey, DoneSoftKey, MenuSoftKey, - CancelSoftKey, + CancelSoftKey }; static void updateSoftKeys(); diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index e5a88fc..21b9cca 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -1160,7 +1160,7 @@ Q_GLOBAL_STATIC_WITH_INITIALIZER(QVector<QRgb>, qt_grayPalette, { QRgb *it = x->data(); for (int i = 0; i < x->size(); ++i, ++it) *it = 0xff000000 | i | (i<<8) | (i<<16); -}); +}) const QVector<QRgb> &QFontEngine::grayPalette() { |