From e6ccfe40eb1cd7c1a5b2c307093552bc39b4cf22 Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Wed, 6 Jun 2012 22:11:21 +0000 Subject: [PATCH] Set Wayland as default platform on Raspberry-Pi Update Raspberry-Pi mkspec to indicate that wayland is the default platform for the Raspberry-Pi. Change-Id: I10b30ecfb16faed6027137225d9e95409faa7e87 Reviewed-by: Johannes Zellner Reviewed-by: Girish Ramakrishnan --- mkspecs/devices/linux-rasp-pi-g++/qmake.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf index 2a3e01037b..7bd429db2a 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf +++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf @@ -4,6 +4,8 @@ include(../common/linux_device_pre.conf) +QT_QPA_DEFAULT_PLATFORM = wayland + QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/opt/vc/lib QMAKE_LIBDIR_OPENGL_ES2 = $$[QT_SYSROOT]/opt/vc/lib @@ -21,8 +23,9 @@ contains(DISTRO, wheezy) { } else:contains(DISTRO, arch) { #On principle: no wizardry required } else { - #Debian Squeeze: Legacy circular dependency + #Debian Squeeze: Legacy everything QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL + QT_QPA_DEFAULT_PLATFORM = eglfs } QMAKE_CFLAGS += \