diff options
| author | David Faure <faure@kde.org> | 2009-06-04 23:55:22 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-06-04 23:55:22 (GMT) |
| commit | ef0d1c839aed75201da10f8db7e515d9fb55bb16 (patch) | |
| tree | 5f00de5b8913379f9bb28df91782840c7efe6a2d /src/gui/kernel | |
| parent | 58c5df4109acf44982c3a2a7b2318da52606232d (diff) | |
| download | Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.zip Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.gz Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.bz2 | |
All of Qt's own code compiles with -pedantic now (but pcre and webkit don't seem fixable easily)
Merge-request: 594
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qaction.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index b2afbd0..051b6a6 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -76,7 +76,7 @@ static QString qt_strippedText(QString s) s.remove(i-1,1); } return s.trimmed(); -}; +} QActionPrivate::QActionPrivate() : group(0), enabled(1), forceDisabled(0), diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index f2a3498..4923d23 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -405,7 +405,7 @@ QPalette *QApplicationPrivate::set_pal = 0; // default palette set by pro QGraphicsSystem *QApplicationPrivate::graphics_system = 0; // default graphics system QString QApplicationPrivate::graphics_system_name; // graphics system id - for delayed initialization -Q_GLOBAL_STATIC(QMutex, applicationFontMutex); +Q_GLOBAL_STATIC(QMutex, applicationFontMutex) QFont *QApplicationPrivate::app_font = 0; // default application font QFont *QApplicationPrivate::sys_font = 0; // default system font QFont *QApplicationPrivate::set_font = 0; // default font set by programmer |