diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-06 08:45:02 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-06 14:35:36 +0200 |
commit | fc9a648dc03ec4531553bc3d65ae4dba3c5b5980 (patch) | |
tree | 285279e0c2755002b1405b4ca7f85e1f0b3c588b /src/plugins/platforms/xlib | |
parent | 0273bc5d22cd1fa08854b023f9b6c318fc75f3fa (diff) |
Make building of platform plugins indifferent if its out of source
This requires some source files to be shipped with the Qt install
They are now copied into QT_INSTALL_DATA/platform
Diffstat (limited to 'src/plugins/platforms/xlib')
-rw-r--r-- | src/plugins/platforms/xlib/xlib.pro | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/plugins/platforms/xlib/xlib.pro b/src/plugins/platforms/xlib/xlib.pro index 2cba5513d5..b6d0e0bf27 100644 --- a/src/plugins/platforms/xlib/xlib.pro +++ b/src/plugins/platforms/xlib/xlib.pro @@ -1,6 +1,6 @@ TARGET = qxlib -load(qt_plugin) +load(qpa/plugin) DESTDIR = $$QT.gui.plugins/platforms QT += core-private gui-private opengl-private @@ -43,19 +43,13 @@ include (../fontdatabases/genericunix/genericunix.pri) contains(QT_CONFIG, opengl) { QT += opengl !contains(QT_CONFIG, opengles2) { - include (../glxconvenience/glxconvenience.pri) + load(qpa/glx/convenience) HEADERS += qglxintegration.h SOURCES += qglxintegration.cpp } else { # There is no easy way to detect if we'r suppose to use glx or not - HEADERS += \ - ../eglconvenience/qeglplatformcontext.h \ - ../eglconvenience/qeglconvenience.h \ - ../eglconvenience/qxlibeglintegration.h - - SOURCES += \ - ../eglconvenience/qeglplatformcontext.cpp \ - ../eglconvenience/qeglconvenience.cpp \ - ../eglconvenience/qxlibeglintegration.cpp + load(qpa/egl/context) + load(qpa/egl/convenience) + load(qpa/egl/xlibintegration) LIBS += -lEGL } } |