From: Daniel Teske <daniel.teske@nokia.com>
Date: Fri, 14 Oct 2011 11:02:37 +0000 (+0200)
Subject: Fix detection of Oxygen style
X-Git-Url: http://git.osdn.net/view?p=qt-creator-jp%2Fqt-creator-jp.git;a=commitdiff_plain;h=18d4d20acbae05b4791f9fc14b85dd1d431f828c

Fix detection of Oxygen style

Change-Id: I2a28335285869ce477d2c71532ccb44046a0cfa7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---

diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 7cdb44e9c8..787e6ecd4b 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -271,7 +271,7 @@ void ManhattanStyle::polish(QWidget *widget)
     QProxyStyle::polish(widget);
 
     // OxygenStyle forces a rounded widget mask on toolbars and dock widgets
-    if (baseStyle()->inherits("OxygenStyle")) {
+    if (baseStyle()->inherits("OxygenStyle") || baseStyle()->inherits("Oxygen::Style")) {
         if (qobject_cast<QToolBar*>(widget) || qobject_cast<QDockWidget*>(widget)) {
             widget->removeEventFilter(baseStyle());
             widget->setContentsMargins(0, 0, 0, 0);