diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2013-06-03 17:46:41 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-06-03 17:46:41 +0200 |
| commit | d20ef80bb54685466dd9d7beae5ddccc46a437fd (patch) | |
| tree | b77c709cbb28810055301fa088062af7de6fc165 /qtwayland.pro | |
| parent | 894adf8a447865119be7c6c4d01577d8032f4177 (diff) | |
| parent | 63482addec06d2bbab0330271cb7d21869156760 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qtwayland.pro
src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.h
Change-Id: I6f9e8fb0536212b7b072aec3c8152390fb9f2922
Diffstat (limited to 'qtwayland.pro')
| -rw-r--r-- | qtwayland.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qtwayland.pro b/qtwayland.pro index 2886cff23..02e8c1463 100644 --- a/qtwayland.pro +++ b/qtwayland.pro @@ -16,8 +16,7 @@ load(qt_parts) } !config_xkbcommon { - warning("QtWayland requires xkbcommon 0.2.0 or higher") - SUBDIRS = + warning("No xkbcommon 0.2.0 or higher found, disabling support for it") } !config_wayland_scanner { |