From 1ecef1ea354c539ca57532a2944bcaa9842db500 Mon Sep 17 00:00:00 2001
From: Donald Carr <donald.carr@nokia.com>
Date: Wed, 11 Jul 2012 18:21:24 +0000
Subject: [PATCH] Update Raspberry Pi mkspec

Hard float enabled Raspbian image is now primary platform provided by the
Raspberry Pi foundation.

Change-Id: I2d59ad26fac459907b4f51764975a3e6e29c6033
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
---
 mkspecs/devices/linux-rasp-pi-g++/qmake.conf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
index 7bd429db2a..a6365d87ef 100644
--- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
+++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
@@ -16,16 +16,16 @@ QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL}
 
 QMAKE_LIBS_EGL          = -lEGL -lGLESv2
 
-contains(DISTRO, wheezy) {
-    DISTRO_OPTS += deb-multi-arch
-} else:contains(DISTRO, bsquask) {
-    DISTRO_OPTS += hard-float
+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 {
-    #Debian Squeeze: Legacy everything
-    QMAKE_LIBS_OPENGL_ES2          = -lGLESv2 -lEGL
-    QT_QPA_DEFAULT_PLATFORM = eglfs
+    #This is not strictly necessary
+    DISTRO_OPTS += deb-multi-arch
+    DISTRO_OPTS += hard-float
 }
 
 QMAKE_CFLAGS            += \