diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 13:01:20 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 13:09:29 +0200 |
| commit | 576a8e152ec36e7465bfdc8ad63998cffbab4091 (patch) | |
| tree | 07472de61c7542a90f675869e480b99076c5b439 /src/widgets/styles/qplastiquestyle.cpp | |
| parent | fb7f30d2bad0c84ffea4db862a71ba2e03d855d0 (diff) | |
| parent | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (diff) | |
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
Diffstat (limited to 'src/widgets/styles/qplastiquestyle.cpp')
| -rw-r--r-- | src/widgets/styles/qplastiquestyle.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/widgets/styles/qplastiquestyle.cpp b/src/widgets/styles/qplastiquestyle.cpp index 79893f066d..cae015ff82 100644 --- a/src/widgets/styles/qplastiquestyle.cpp +++ b/src/widgets/styles/qplastiquestyle.cpp @@ -83,7 +83,6 @@ static const int blueFrameWidth = 2; // with of line edit focus frame #include <qtoolbar.h> #include <qtoolbox.h> #include <qtoolbutton.h> -#include <qworkspace.h> #include <qprocess.h> #include <qvarlengtharray.h> #include <limits.h> @@ -5629,10 +5628,8 @@ void QPlastiqueStyle::polish(QWidget *widget) widget->setAttribute(Qt::WA_Hover); } - if (widget->inherits("QWorkspaceTitleBar") - || widget->inherits("QDockSeparator") - || widget->inherits("QDockWidgetSeparator") - || widget->inherits("Q3DockWindowResizeHandle")) { + if (widget->inherits("QDockSeparator") + || widget->inherits("QDockWidgetSeparator")) { widget->setAttribute(Qt::WA_Hover); } @@ -5685,10 +5682,8 @@ void QPlastiqueStyle::unpolish(QWidget *widget) widget->setAttribute(Qt::WA_Hover, false); } - if (widget->inherits("QWorkspaceTitleBar") - || widget->inherits("QDockSeparator") - || widget->inherits("QDockWidgetSeparator") - || widget->inherits("Q3DockWindowResizeHandle")) { + if (widget->inherits("QDockSeparator") + || widget->inherits("QDockWidgetSeparator")) { widget->setAttribute(Qt::WA_Hover, false); } |