summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNodir Temirkhodjaev <nodir.temir@gmail.com>2019-12-19 17:24:24 +0500
committerNodir Temirkhodjaev <nodir.temir@gmail.com>2020-01-10 10:03:28 +0500
commit9a112bebe56f5975bdb11549c8d66773cf60419f (patch)
treed833d285532a7305855bf7ffe8ab83c853014f78 /src
parentf1e5c5575cc362bc23da500d069dc98e082492e4 (diff)
QWindowsVistaStyle: Fix build with no dockwidget & commandlinkbutton features
Change-Id: I0f7465cbe80e305680df37b2bf5e2f50874e6fe3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/styles/windowsvista/qwindowsvistastyle.cpp9
-rw-r--r--src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
index 345267c8fc..e8d74180cd 100644
--- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
@@ -1365,6 +1365,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
QWindowsStyle::drawControl(element, &copyOpt, painter, widget);
}
break;
+#if QT_CONFIG(dockwidget)
case CE_DockWidgetTitle:
if (const QStyleOptionDockWidget *dwOpt = qstyleoption_cast<const QStyleOptionDockWidget *>(option)) {
const QDockWidget *dockWidget = qobject_cast<const QDockWidget *>(widget);
@@ -1431,6 +1432,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
}
}
break;
+#endif // QT_CONFIG(dockwidget)
#if QT_CONFIG(itemviews)
case CE_ItemViewItem:
{
@@ -2311,11 +2313,13 @@ void QWindowsVistaStyle::polish(QWidget *widget)
#endif // QT_CONFIG(lineedit)
if (qobject_cast<QGroupBox*>(widget))
widget->setAttribute(Qt::WA_Hover);
+#if QT_CONFIG(commandlinkbutton)
else if (qobject_cast<QCommandLinkButton*>(widget)) {
QFont buttonFont = widget->font();
buttonFont.setFamily(QLatin1String("Segoe UI"));
widget->setFont(buttonFont);
}
+#endif // QT_CONFIG(commandlinkbutton)
else if (widget->inherits("QTipLabel")){
//note that since tooltips are not reused
//we do not have to care about unpolishing
@@ -2392,12 +2396,15 @@ void QWindowsVistaStyle::unpolish(QWidget *widget)
#endif // QT_CONFIG(inputdialog)
else if (QTreeView *tree = qobject_cast<QTreeView *> (widget)) {
tree->viewport()->setAttribute(Qt::WA_Hover, false);
- } else if (qobject_cast<QCommandLinkButton*>(widget)) {
+ }
+#if QT_CONFIG(commandlinkbutton)
+ else if (qobject_cast<QCommandLinkButton*>(widget)) {
QFont font = QApplication::font("QCommandLinkButton");
QFont widgetFont = widget->font();
widgetFont.setFamily(font.family()); //Only family set by polish
widget->setFont(widgetFont);
}
+#endif // QT_CONFIG(commandlinkbutton)
}
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h b/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h
index 8fef9f9927..c1d764a60e 100644
--- a/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h
+++ b/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h
@@ -106,7 +106,9 @@
#include <qtableview.h>
#endif
#include <qdatetime.h>
+#if QT_CONFIG(commandlinkbutton)
#include <qcommandlinkbutton.h>
+#endif
QT_BEGIN_NAMESPACE