[meta-freescale] [meta-fsl-arm][daisy][PATCH] qt4: sync g++.conf file with upstream

[Javier Viguera]

Since this g++.conf file was added to fix some MX6 issues the upstream
version of the file in which it's based has received some more fixes:

http://git.openembedded.org/openembedded-core/commit/?id=6456b596a73232429e0d223089f32dc350ea20b0
http://git.openembedded.org/openembedded-core/commit/?id=6c78f629323bea0be44181d60e3ce45be0416093

This commit fixes an error building QT applications in debug mode
(CONFIG+=debug in the QT project file) with a toolchain generated for a
MX6 machine (with populate_sdk).

Signed-off-by: Javier Viguera <javier.viguera at digi.com>
---
 recipes-qt/qt4/qt4/mx6/g++.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/recipes-qt/qt4/qt4/mx6/g++.conf b/recipes-qt/qt4/qt4/mx6/g++.conf
index 4a4729e1b875..2843d1ebcc1c 100644
--- a/recipes-qt/qt4/qt4/mx6/g++.conf
+++ b/recipes-qt/qt4/qt4/mx6/g++.conf
@@ -2,6 +2,8 @@
 # qmake configuration for common gcc
 #
 
+QMAKE_COMPILER = gcc
+
 QMAKE_CC       = $(OE_QMAKE_CC)
 QMAKE_CFLAGS       += -pipe $(OE_QMAKE_CFLAGS) -DLINUX=1 -DEGL_API_FB=1
 QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
@@ -49,6 +51,9 @@ QMAKE_PCH_OUTPUT_EXT    = .gch
 QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
 QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
 
+# do not depend on gdb
+CONFIG -= gdb_dwarf_index
+
 # some linking helper...
 CONFIG += rpath_libdirs