diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:19:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-04 16:05:53 +0200 |
| commit | c2b224a758ce7e6dcf3748444fa8e29ab81904be (patch) | |
| tree | 277cb99bf054190c935579142506caa4ec9861dd /src/widgets/configure.json | |
| parent | 10de063ff12cdba07b4620182aced8ed05ee3505 (diff) | |
| parent | eaee1209f0ead5be786e81db8aee604ccfea85b0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qprocess_unix.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/util/util.pri
tests/auto/corelib/thread/qthread/qthread.pro
tests/auto/corelib/thread/qthread/tst_qthread.cpp
Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b
Diffstat (limited to 'src/widgets/configure.json')
| -rw-r--r-- | src/widgets/configure.json | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/widgets/configure.json b/src/widgets/configure.json index f19188e584..2c183dad65 100644 --- a/src/widgets/configure.json +++ b/src/widgets/configure.json @@ -426,13 +426,6 @@ "section": "Widgets", "output": [ "publicFeature", "feature" ] }, - "whatsthis": { - "label": "QWhatsThis", - "purpose": "Supports displaying \"What's this\" help.", - "section": "Widgets", - "condition": "features.toolbutton", - "output": [ "publicFeature", "feature" ] - }, "sizegrip": { "label": "QSizeGrip", "purpose": "Provides corner-grips for resizing top-level windows.", |