diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-10-17 14:20:02 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-10-30 13:44:29 +0100 |
| commit | 848d29cca3afa92f1ae729a1c882e8e3e56fb3e3 (patch) | |
| tree | 14c30ed107fa43b892d1dc7f8da8ceaa2cf16550 /mkspecs/devices/linux-rasp-pi-g++/qmake.conf | |
| parent | a5c624622becc8cdf5a1bcd6f8b8e3c1cca53371 (diff) | |
Raspi: default platform plugin is eglfs
Not wayland. Use the default of eglfs coming from linux_device_pre.conf.
Qt 5.4 includes QtWayland and the platform plugin from there may get built
unexpectedly. The result is that the Pi setup that worked with 5.3 and eglfs
stops functioning.
Task-number: QTBUG-40538
Change-Id: If894c7ddd7b40a22272797d94ce1a545b7ab43f2
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'mkspecs/devices/linux-rasp-pi-g++/qmake.conf')
| -rw-r--r-- | mkspecs/devices/linux-rasp-pi-g++/qmake.conf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf index 5f923ad5c6..6537d457ab 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf +++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf @@ -4,8 +4,6 @@ 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,7 +19,6 @@ QMAKE_LIBS_EGL = -lEGL -lGLESv2 contains(DISTRO, squeeze) { #Debian Squeeze: Legacy everything QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL - QT_QPA_DEFAULT_PLATFORM = eglfs } else:contains(DISTRO, arch) { #On principle: no wizardry required } else { |