diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:49:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:49:16 +0100 |
| commit | 9fd54bac3075eb74413776657464027a277d43cf (patch) | |
| tree | ae74789b061df42fef2fd9d97446cd0b34a9a083 /src/client | |
| parent | 2a47c83674a8e19b287cc731cbe814ca411f269f (diff) | |
| parent | 391c71b4488d69f3a0b16171b01f569fbc9ec07b (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Idd91b55bc2b1e3506d9385b3352aeda06de6d4bc
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/global/qwaylandclientextension.h | 1 | ||||
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/client/global/qwaylandclientextension.h b/src/client/global/qwaylandclientextension.h index 37345202c..abf753249 100644 --- a/src/client/global/qwaylandclientextension.h +++ b/src/client/global/qwaylandclientextension.h @@ -40,6 +40,7 @@ #include <QObject> #include <QtWaylandClient/qtwaylandclientglobal.h> +struct wl_interface; struct wl_registry; QT_BEGIN_NAMESPACE diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index f9ee61156..8bd9f4901 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -217,6 +217,11 @@ void QWaylandIntegration::initialize() int fd = wl_display_get_fd(mDisplay->wl_display()); QSocketNotifier *sn = new QSocketNotifier(fd, QSocketNotifier::Read, mDisplay.data()); QObject::connect(sn, SIGNAL(activated(int)), mDisplay.data(), SLOT(flushRequests())); + + if (mDisplay->screens().isEmpty()) { + qWarning() << "Running on a compositor with no screens is not supported"; + ::exit(EXIT_FAILURE); + } } QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const |