diff options
| author | Guoqing Zhang <guoqing.zhang@nokia.com> | 2011-04-11 06:18:57 (GMT) |
|---|---|---|
| committer | Guoqing Zhang <guoqing.zhang@nokia.com> | 2011-04-11 06:18:57 (GMT) |
| commit | 65d255c80d0e029bc94b320fa315095b957098a0 (patch) | |
| tree | d9b5bdb1474f22507e46f5525777ffc43277f081 /src/gui/styles | |
| parent | fe4e8d469938f2c337e186c03930d543677c3ee2 (diff) | |
| parent | 082b9125d627df11692f2a03b80c9e962e82eda5 (diff) | |
| download | Qt-65d255c80d0e029bc94b320fa315095b957098a0.zip Qt-65d255c80d0e029bc94b320fa315095b957098a0.tar.gz Qt-65d255c80d0e029bc94b320fa315095b957098a0.tar.bz2 | |
Merge remote branch 'qt-master/master'
Conflicts:
src/s60installs/qt.iby
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index fbba09d..680e007 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -77,14 +77,12 @@ #include "private/qcombobox_p.h" #include "private/qwidget_p.h" #include "private/qapplication_p.h" +#include "private/qfont_p.h" #if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN) QT_BEGIN_NAMESPACE -// from text/qfont.cpp -extern Q_GUI_EXPORT int qt_defaultDpiY(); - const QS60StylePrivate::SkinElementFlags QS60StylePrivate::KDefaultSkinElementFlags = SkinElementFlags(SF_PointNorth | SF_StateEnabled); |