diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-04 11:29:42 +0200 |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-04 11:29:42 +0200 |
commit | 7767d1e2fe6b0e5b679a2b3306ec51808668ee4d (patch) | |
tree | dc969a7dcab747bb88f62b31721bd0acd0ccf742 /src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri | |
parent | 91a1eda4642b1ac140916b8af755f6013beaed6a (diff) | |
parent | a4a585d2ee907746682846ae6e8a48e19deef469 (diff) |
Merge remote-tracking branch 'qml/qtquick2' into qtquick2-v8
Conflicts:
src/script/api/qscriptengine.cpp
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
Diffstat (limited to 'src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri')
-rw-r--r-- | src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri b/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri new file mode 100644 index 0000000000..0d8e01b6bb --- /dev/null +++ b/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri @@ -0,0 +1,14 @@ + +LIBS += -lX11 -lXext -lEGL + +HEADERS += \ + $$PWD/qwaylandreadbackeglintegration.h \ + $$PWD/qwaylandreadbackeglcontext.h \ + $$PWD/qwaylandreadbackeglwindow.h \ + $$PWD/../../../eglconvenience/qeglconvenience.h + +SOURCES += \ + $$PWD/qwaylandreadbackeglintegration.cpp \ + $$PWD/qwaylandreadbackeglwindow.cpp \ + $$PWD/qwaylandreadbackeglcontext.cpp \ + $$PWD/../../../eglconvenience/qeglconvenience.cpp |