diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:46:23 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:46:23 +0200 |
| commit | 21a2ce41a8efb6c5ab4ab2674458309bc9f031b7 (patch) | |
| tree | 927045bf52f3367551cb4af17aa6b5738408c1bb /src/qt-compositor/wayland_wrapper/wloutput.cpp | |
| parent | e47eb9057bf08834885ba6ef5e593d6f1844405c (diff) | |
| parent | af711da1389c86c969d4872ec0936a90c46e1343 (diff) | |
Merge branch 'refactor'
Conflicts:
src/qt-compositor/compositor_api/waylandcompositor.cpp
src/qt-compositor/wayland_wrapper/wloutput.cpp
Diffstat (limited to 'src/qt-compositor/wayland_wrapper/wloutput.cpp')
| -rw-r--r-- | src/qt-compositor/wayland_wrapper/wloutput.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qt-compositor/wayland_wrapper/wloutput.cpp b/src/qt-compositor/wayland_wrapper/wloutput.cpp index 39bf7c9..ba3e45a 100644 --- a/src/qt-compositor/wayland_wrapper/wloutput.cpp +++ b/src/qt-compositor/wayland_wrapper/wloutput.cpp @@ -39,9 +39,9 @@ ****************************************************************************/ #include "wloutput.h" - -#include <QtGui/QApplication> -#include <QtGui/QDesktopWidget> +#include <QGuiApplication> +#include <QtGui/QScreen> +#include <QRect> namespace Wayland { @@ -58,11 +58,11 @@ void output_post_geometry(struct wl_client *client, struct wl_object *global, ui Output::Output() - : m_geometry(QPoint(0,0), QApplication::desktop()->screenGeometry().size()) - , m_displayId(-1) + : m_displayId(-1) , m_numQueued(0) { - + QScreen *screen = QGuiApplication::primaryScreen(); + m_geometry = QRect(QPoint(0, 0), screen->availableGeometry().size()); } void Output::setGeometry(const QRect &geometry) |