diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-17 03:49:53 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-17 03:49:53 (GMT) |
| commit | 815a5f08161f7add4a8b9d71f95bed0f45fbbe41 (patch) | |
| tree | 33d2e68038826ea0f5fec402303a585403b0be21 /src/gui/widgets/qmainwindow.cpp | |
| parent | 5872a38a2f2ccc67b590d580a258e110ee2d80dc (diff) | |
| parent | 467face42d2db216860dade5f5d817a8cddb86f3 (diff) | |
| download | Qt-815a5f08161f7add4a8b9d71f95bed0f45fbbe41.zip Qt-815a5f08161f7add4a8b9d71f95bed0f45fbbe41.tar.gz Qt-815a5f08161f7add4a8b9d71f95bed0f45fbbe41.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/widgets/qmainwindow.cpp')
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 9243217..88059a0 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -73,7 +73,7 @@ class QMainWindowPrivate : public QWidgetPrivate Q_DECLARE_PUBLIC(QMainWindow) public: inline QMainWindowPrivate() - : layout(0), toolButtonStyle(Qt::ToolButtonIconOnly) + : layout(0), explicitIconSize(false), toolButtonStyle(Qt::ToolButtonIconOnly) #ifdef Q_WS_MAC , useHIToolBar(false) #endif @@ -107,8 +107,6 @@ void QMainWindowPrivate::init() layout = new QMainWindowLayout(q); const int metric = q->style()->pixelMetric(QStyle::PM_ToolBarIconSize, 0, q); iconSize = QSize(metric, metric); - explicitIconSize = false; - q->setAttribute(Qt::WA_Hover); } |