diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-20 11:21:58 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-20 12:06:33 +0200 |
| commit | d1d8df1076fe7884056798e1974a299ab9d7684e (patch) | |
| tree | 46068ffeb8cd64f8d875f0cc4af1788dadda5fda /src/gui/styles/qcommonstyle.cpp | |
| parent | 7a1accc89c5c45ef514ebf0e7693cd9522fa0362 (diff) | |
| download | qt4-tools-d1d8df1076fe7884056798e1974a299ab9d7684e.tar.gz | |
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/styles/qcommonstyle.cpp')
| -rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 8036728135..4978565648 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -65,7 +65,6 @@ #include <qrubberband.h> #include <private/qcommonstylepixmaps_p.h> #include <private/qmath_p.h> -#include <private/qstylehelper_p.h> #include <qdebug.h> #include <qtextformat.h> #include <qwizard.h> @@ -88,6 +87,8 @@ # include <private/qt_cocoa_helpers_mac_p.h> #endif +#include <private/qstylehelper_p.h> + QT_BEGIN_NAMESPACE /*! |