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/xcb | |
| 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/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index b78844a8d4..5d48ff9b50 100644 --- a/src/plugins/platforms/xcb/xcb.pro +++ b/src/plugins/platforms/xcb/xcb.pro @@ -1,6 +1,6 @@ TARGET = xcb -load(qt_plugin) +load(qpa/plugin) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms QT += core-private gui-private @@ -50,20 +50,14 @@ contains(QT_CONFIG, opengl) { contains(QT_CONFIG, opengles2) { DEFINES += XCB_USE_EGL - HEADERS += \ - ../eglconvenience/qeglplatformcontext.h \ - ../eglconvenience/qeglconvenience.h \ - ../eglconvenience/qxlibeglintegration.h - - SOURCES += \ - ../eglconvenience/qeglplatformcontext.cpp \ - ../eglconvenience/qeglconvenience.cpp \ - ../eglconvenience/qxlibeglintegration.cpp + load(qpa/egl/convenience) + load(qpa/egl/context) + load(qpa/egl/xlibintegration) LIBS += -lEGL } else { DEFINES += XCB_USE_GLX - include (../glxconvenience/glxconvenience.pri) + load(qpa/glx/convenience) HEADERS += qglxintegration.h SOURCES += qglxintegration.cpp } @@ -76,9 +70,9 @@ DEFINES += $$QMAKE_DEFINES_XCB LIBS += $$QMAKE_LIBS_XCB QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB -include (../fontdatabases/genericunix/genericunix.pri) -include (../printersupport/genericunix/genericunix.pri) -include (../dnd/dnd.pri) +load(qpa/fontdatabases/genericunix) +load(qpa/printersupport/genericunix) +load(qpa/dnd/simple) target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target |