diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:07:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:08:18 +0200 |
| commit | d1ea4813458b383e66ce4df69d1833b8b6a279c4 (patch) | |
| tree | 3bdc16da993e5de56b669e6774fb0748075ddd90 /src/widgets/configure.json | |
| parent | 1c87d4e1a1d0e1972f6dc85e55ea9be8a42797ba (diff) | |
| parent | 0b1ec78c2d4871afcc89d5b046926b88f0819a7c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/network/access/qnetworkreply.cpp
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
Diffstat (limited to 'src/widgets/configure.json')
| -rw-r--r-- | src/widgets/configure.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/configure.json b/src/widgets/configure.json index b1a301c7d0..f19188e584 100644 --- a/src/widgets/configure.json +++ b/src/widgets/configure.json @@ -87,7 +87,7 @@ "label": "The Model/View Framework", "purpose": "Provides the model/view architecture managing the relationship between data and the way it is presented to the user.", "section": "ItemViews", - "condition": "features.itemmodel && features.rubberband && features.scrollarea", + "condition": "features.itemmodel && features.scrollarea", "output": [ "publicFeature", "feature" ] }, "treewidget": { @@ -154,7 +154,6 @@ "label": "QSplitter", "purpose": "Provides user controlled splitter widgets.", "section": "Widgets", - "condition": "features.rubberband", "output": [ "publicFeature", "feature" ] }, "widgettextcontrol": { @@ -298,7 +297,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": { |