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/wayland_wrapper.pri | |
| 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/wayland_wrapper.pri')
| -rw-r--r-- | src/qt-compositor/wayland_wrapper/wayland_wrapper.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qt-compositor/wayland_wrapper/wayland_wrapper.pri b/src/qt-compositor/wayland_wrapper/wayland_wrapper.pri index 348267e..16a0e7e 100644 --- a/src/qt-compositor/wayland_wrapper/wayland_wrapper.pri +++ b/src/qt-compositor/wayland_wrapper/wayland_wrapper.pri @@ -4,7 +4,8 @@ HEADERS += \ $$PWD/wloutput.h \ $$PWD/wlshmbuffer.h \ $$PWD/wlsurface.h \ - $$PWD/wlselection.h + $$PWD/wlselection.h \ + $$PWD/wldrag.h SOURCES += \ $$PWD/wlcompositor.cpp \ @@ -12,4 +13,5 @@ SOURCES += \ $$PWD/wloutput.cpp \ $$PWD/wlshmbuffer.cpp \ $$PWD/wlsurface.cpp \ - $$PWD/wlselection.cpp + $$PWD/wlselection.cpp \ + $$PWD/wldrag.cpp |