diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-03-02 08:50:10 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-03-02 08:54:08 (GMT) |
| commit | 12573a8860d10cf023246e9d3d7f5739d83aabe4 (patch) | |
| tree | 556089ec2e50fd6df1bdb70cf09687ae9c1e519d /mkspecs/common | |
| parent | 53741ff1983a9d0085658b96743b125daaa5e680 (diff) | |
| download | Qt-12573a8860d10cf023246e9d3d7f5739d83aabe4.zip Qt-12573a8860d10cf023246e9d3d7f5739d83aabe4.tar.gz Qt-12573a8860d10cf023246e9d3d7f5739d83aabe4.tar.bz2 | |
Build fixes for the Wayland plugin
Add qmake.conf variables, and use the generic font plugin.
Reviewed-by: Jørgen
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/linux.conf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index e443be1..283cf83 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -35,6 +35,11 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread +QMAKE_CFLAGS_WAYLAND = +QMAKE_INCDIR_WAYLAND = +QMAKE_LIBS_WAYLAND = -lwayland-client -lxkbcommon +QMAKE_DEFINES_WAYLAND = + QMAKE_MOC = $$[QT_INSTALL_BINS]/moc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic |