diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-20 09:21:58 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-20 10:06:33 (GMT) |
| commit | d1d8df1076fe7884056798e1974a299ab9d7684e (patch) | |
| tree | 46068ffeb8cd64f8d875f0cc4af1788dadda5fda /src/gui/image/qicon.cpp | |
| parent | 7a1accc89c5c45ef514ebf0e7693cd9522fa0362 (diff) | |
| download | Qt-d1d8df1076fe7884056798e1974a299ab9d7684e.zip Qt-d1d8df1076fe7884056798e1974a299ab9d7684e.tar.gz Qt-d1d8df1076fe7884056798e1974a299ab9d7684e.tar.bz2 | |
Compile with gcc 4.0.1
qstylehelper_p.h now includes qstringbuilder.h
This triggers a gcc 4.0.1 bug when doing addition or % on annonymous enum
- include qstylehelper_p.h last to avoid errors in 3rd party header
- explicitly cast enums to int in qwindowsstyle.cpp
Reviewed-by: Thierry
Diffstat (limited to 'src/gui/image/qicon.cpp')
| -rw-r--r-- | src/gui/image/qicon.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 7696632..a2f429a 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -55,7 +55,6 @@ #include "qcache.h" #include "qdebug.h" #include "private/qguiplatformplugin_p.h" -#include "private/qstylehelper_p.h" #ifdef Q_WS_MAC #include <private/qt_mac_p.h> @@ -67,6 +66,8 @@ #include "private/qkde_p.h" #endif +#include "private/qstylehelper_p.h" + #ifndef QT_NO_ICON QT_BEGIN_NAMESPACE |