From 38bedf34c9190e3ab7d662eed39a1248698095d8 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Thu, 20 Apr 2017 20:12:20 +0200 Subject: [PATCH] Remove wrong features.rubberband condition of features.dockwidget Change-Id: I8259274e7eba7943eb3a944a18fa8b598eb697d7 Reviewed-by: Lars Knoll --- src/widgets/configure.json | 2 +- src/widgets/widgets/qdockwidget.cpp | 1 - src/widgets/widgets/qdockwidget_p.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/widgets/configure.json b/src/widgets/configure.json index ab8ced3849..ec3dedca6a 100644 --- a/src/widgets/configure.json +++ b/src/widgets/configure.json @@ -304,7 +304,7 @@ "label": "QDockwidget", "purpose": "Supports docking widgets inside a QMainWindow or floated as a top-level window on the desktop.", "section": "Widgets", - "condition": "features.rubberband && features.mainwindow", + "condition": "features.mainwindow", "output": [ "publicFeature", "feature" ] }, "mdiarea": { diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 307a261a43..6d9731e962 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h index 84bf8efacf..2d62cf5acd 100644 --- a/src/widgets/widgets/qdockwidget_p.h +++ b/src/widgets/widgets/qdockwidget_p.h @@ -63,7 +63,6 @@ QT_BEGIN_NAMESPACE class QGridLayout; class QWidgetResizeHandler; -class QRubberBand; class QDockWidgetTitleButton; class QSpacerItem; class QDockWidgetItem;