summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles/qstylesheetstyle.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-05-07 20:56:32 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-05-07 20:56:32 +0200
commit7ff96330ed28b957a80d294a43748c8051c0e483 (patch)
tree435ad1eebe666d8e8eee21cd888d183899b7ef4f /src/widgets/styles/qstylesheetstyle.cpp
parentd3d078aa4ba2aeebb0998e75cd9d5b980db7fbfe (diff)
get QtWidgets to link
some more changes, mainly exporting methods from QtGui to get QtWidgets to link.
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle.cpp')
-rw-r--r--src/widgets/styles/qstylesheetstyle.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 84272e23fb..750b408bd9 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -978,8 +978,9 @@ QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QWidget
hintValue = (int) decl.colorValue().rgba();
} else if (hintName.endsWith(QLatin1String("size"))) {
hintValue = decl.sizeValue();
- } else if (hintName.endsWith(QLatin1String("icon"))) {
- hintValue = decl.iconValue();
+ // ### Qt5
+// } else if (hintName.endsWith(QLatin1String("icon"))) {
+// hintValue = decl.iconValue();
} else if (hintName == QLatin1String("button-layout")
&& decl.d->values.count() != 0 && decl.d->values.at(0).type == Value::String) {
hintValue = subControlLayout(decl.d->values.at(0).variant.toString());
@@ -2508,7 +2509,8 @@ void QStyleSheetStyle::setProperties(QWidget *w)
}
QVariant v;
switch (value.type()) {
- case QVariant::Icon: v = decl.iconValue(); break;
+ // ### Qt 5
+// case QVariant::Icon: v = decl.iconValue(); break;
case QVariant::Image: v = QImage(decl.uriValue()); break;
case QVariant::Pixmap: v = QPixmap(decl.uriValue()); break;
case QVariant::Rect: v = decl.rectValue(); break;