Title: [132191] trunk/Source/WebKit/qt
- Revision
- 132191
- Author
- hausm...@webkit.org
- Date
- 2012-10-23 01:25:46 -0700 (Tue, 23 Oct 2012)
Log Message
Unreviewed build fix with newer Qt 5.
QPlastiqueStyle has been removed, but as pointed out by Jens it's also not
maintained anymore and hence safe to remove. We can do tweaks with the new
fusion style if required.
* WebCoreSupport/QStyleFacadeImp.cpp:
(WebKit::QStyleFacadeImp::paintInnerSpinButton):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (132190 => 132191)
--- trunk/Source/WebKit/qt/ChangeLog 2012-10-23 08:25:39 UTC (rev 132190)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-10-23 08:25:46 UTC (rev 132191)
@@ -1,3 +1,14 @@
+2012-10-23 Simon Hausmann <simon.hausm...@digia.com>
+
+ Unreviewed build fix with newer Qt 5.
+
+ QPlastiqueStyle has been removed, but as pointed out by Jens it's also not
+ maintained anymore and hence safe to remove. We can do tweaks with the new
+ fusion style if required.
+
+ * WebCoreSupport/QStyleFacadeImp.cpp:
+ (WebKit::QStyleFacadeImp::paintInnerSpinButton):
+
2012-10-22 Simon Hausmann <simon.hausm...@digia.com>
[Qt] Fix build without QtWidgets
Modified: trunk/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp (132190 => 132191)
--- trunk/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp 2012-10-23 08:25:39 UTC (rev 132190)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp 2012-10-23 08:25:46 UTC (rev 132191)
@@ -30,9 +30,6 @@
#include <QMacStyle>
#include <QPainter>
#include <QPushButton>
-#ifndef QT_NO_STYLE_PLASTIQUE
-#include <QPlastiqueStyle>
-#endif
#include <QStyleFactory>
#include <QStyleOption>
@@ -373,13 +370,6 @@
option.state |= QStyle::State_Mini;
}
#endif
-#if !defined(QT_NO_STYLE_PLASTIQUE)
- // QPlastiqueStyle looks best when the spin buttons are flush with the frame's edge.
- if (qobject_cast<QPlastiqueStyle*>(style())) {
- inflateX = 0;
- inflateY = 0;
- }
-#endif
buttonRect.inflateX(inflateX);
buttonRect.inflateY(inflateY);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
