diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2014-01-09 15:10:43 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2014-01-09 16:10:23 +0100 |
| commit | 1c70431808ca2d0797fda05bb9ee3640bff800bb (patch) | |
| tree | 6bbf1333b7da5afea2e163263820d5c40dbc1ea3 /src/plugins/waylandcompositors/xcomposite-egl/xcomposite-egl.pro | |
| parent | 3e02c41cc43a20c8af41730934ae7bbac02ab861 (diff) | |
| parent | c9734e76ce03ebba63e34b60b16a9cca3efa3569 (diff) | |
Merge remote-tracking branch stable into dev
Conflicts:
.qmake.conf
src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
src/plugins/platforms/qwayland-brcm-egl/main.cpp
src/plugins/platforms/qwayland-egl/main.cpp
src/plugins/platforms/qwayland-generic/main.cpp
src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
Change-Id: I957c9bee893a9e19fc8c93f0e51292007fb3a4a8
Diffstat (limited to 'src/plugins/waylandcompositors/xcomposite-egl/xcomposite-egl.pro')
| -rw-r--r-- | src/plugins/waylandcompositors/xcomposite-egl/xcomposite-egl.pro | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/plugins/waylandcompositors/xcomposite-egl/xcomposite-egl.pro b/src/plugins/waylandcompositors/xcomposite-egl/xcomposite-egl.pro deleted file mode 100644 index d463e6e83..000000000 --- a/src/plugins/waylandcompositors/xcomposite-egl/xcomposite-egl.pro +++ /dev/null @@ -1,22 +0,0 @@ -PLUGIN_TYPE = waylandcompositors -load(qt_plugin) - -QT = compositor compositor-private core-private gui-private - -OTHER_FILES += xcomposite-egl.json - -include (../xcomposite_share/xcomposite_share.pri) - -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += xcomposite egl x11 -} else { - LIBS += -lXcomposite -lEGL -lX11 -} - -HEADERS += \ - xcompositeeglintegration.h - -SOURCES += \ - xcompositeeglintegration.cpp \ - main.cpp |