diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-08 01:00:59 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-08 01:01:00 +0100 |
| commit | f8c5c1356465f503e1a8357ceff01bb956d51c9e (patch) | |
| tree | 36b5bc1c2d5767b3eee0820c70b91fdfc57287b3 /src/gui | |
| parent | eda28621f6c1a68774719f382be53ec109123b18 (diff) | |
| parent | 153726bc167406414f589f72bea76c3229cfa815 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ied1194730e75a6f30839bbf5429aa2699230288e
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.json | 15 | ||||
| -rw-r--r-- | src/gui/image/qiconengine.h | 1 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 25ff553876..6a2f1fe434 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -618,16 +618,6 @@ { "type": "pkgConfig", "args": "xkbcommon-x11" } ] }, - "xkbcommon_evdev": { - "label": "xkbcommon_evdev TRANSITION HACK", - "test": { - "include": [ "xkbcommon/xkbcommon.h" ], - "main": "xkb_context_new(XKB_CONTEXT_NO_FLAGS);" - }, - "sources": [ - { "type": "pkgConfig", "args": "xkbcommon >= 0.5.0" } - ] - }, "xrender": { "label": "XRender for native painting", "test": "x11/xrender", @@ -1378,11 +1368,6 @@ "condition": "libs.xkbcommon", "output": [ "privateFeature" ] }, - "xkbcommon-evdev": { - "label": "xkbcommon-evdev TRANSITION HACK", - "condition": "libs.xkbcommon_evdev", - "output": [ "privateFeature" ] - }, "xlib": { "label": "XLib", "autoDetect": "!config.darwin || features.xcb", diff --git a/src/gui/image/qiconengine.h b/src/gui/image/qiconengine.h index 0c67ef2686..0c5b51dc71 100644 --- a/src/gui/image/qiconengine.h +++ b/src/gui/image/qiconengine.h @@ -90,6 +90,7 @@ public: QPixmap pixmap; }; + // ### Qt6: move content to proper virtual functions virtual void virtual_hook(int id, void *data); private: |