diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
| commit | ad13e0a1fd8fc9d4e6c9e02fca40501e2d4faa6d (patch) | |
| tree | c9533ac546065b0c3cd5fd4045fa2e4715172a97 /src/plugins/platforms/wayland/wayland.pro | |
| parent | a85e53d7203576691dc18203d8784979b208033d (diff) | |
| parent | 185baa0d7cebdef3049a8531d953e92e333b9bcb (diff) | |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'src/plugins/platforms/wayland/wayland.pro')
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index 1a9368f13..e49c73bfa 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -45,8 +45,10 @@ QT += core-private QT += widgets-private include ($$PWD/gl_integration/gl_integration.pri) +include ($$PWD/windowmanager_integration/windowmanager_integration.pri) include (../fontdatabases/genericunix/genericunix.pri) target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target + |