diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-24 15:45:02 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-24 15:45:02 (GMT) |
| commit | 3003f1d885e732e7cc19f73f9733aa8102b70717 (patch) | |
| tree | 283f16e0e918023f53fa9c35463cc57b025656a4 /src/gui/styles/qstylehelper.cpp | |
| parent | af84e21c40d3441546b22f631fc2d34a48580740 (diff) | |
| parent | 1079096a57112d9615812771adba18d2e9297320 (diff) | |
| download | Qt-3003f1d885e732e7cc19f73f9733aa8102b70717.zip Qt-3003f1d885e732e7cc19f73f9733aa8102b70717.tar.gz Qt-3003f1d885e732e7cc19f73f9733aa8102b70717.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/styles/qstylehelper.cpp')
| -rw-r--r-- | src/gui/styles/qstylehelper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp index d09d7fa..ccdbf8c 100644 --- a/src/gui/styles/qstylehelper.cpp +++ b/src/gui/styles/qstylehelper.cpp @@ -39,8 +39,6 @@ ** ****************************************************************************/ -#include "qstylehelper_p.h" - #include <qstyleoption.h> #include <qpainter.h> #include <qpixmapcache.h> @@ -54,6 +52,7 @@ #include <private/qt_cocoa_helpers_mac_p.h> #endif +#include "qstylehelper_p.h" #include <qstringbuilder.h> QT_BEGIN_NAMESPACE |