diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2013-01-14 15:30:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-14 18:24:31 +0100 |
| commit | 90cb4d8e2e15ec3ebcf008dbc2d1b0c3cb975791 (patch) | |
| tree | 86c0323f0f89f898a113a17653978f8bc866c2ab /mkspecs | |
| parent | f12cc9c6489d1882058dd990383a7f43f204bbcd (diff) | |
Fix QtBase cross compilation in debug mode for iMX6 targets.
The platform specific CFLAGS, most notably -march=armv7-a, were only
added to QMake's _RELEASE flags but not to the _DEBUG flags.
This then resulted in strange compilation errors such as this one:
http://qt-project.org/forums/viewthread/22141
Change-Id: Ib47996c6946b043294437e8543827da270df836d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/devices/linux-imx6-g++/qmake.conf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf index 322a19d05b..20f6d115bf 100644 --- a/mkspecs/devices/linux-imx6-g++/qmake.conf +++ b/mkspecs/devices/linux-imx6-g++/qmake.conf @@ -27,9 +27,12 @@ QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib -IMX6_CFLAGS = -O2 -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1 -QMAKE_CFLAGS_RELEASE += $$IMX6_CFLAGS -QMAKE_CXXFLAGS_RELEASE += $$IMX6_CFLAGS +IMX6_CFLAGS = -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1 +IMX6_CFLAGS_RELEASE = -O2 $$IMX6_CFLAGS +QMAKE_CFLAGS_RELEASE += $$IMX6_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE += $$IMX6_CFLAGS_RELEASE +QMAKE_CFLAGS_DEBUG += $$IMX6_CFLAGS +QMAKE_CXXFLAGS_DEBUG += $$IMX6_CFLAGS include(../common/linux_device_post.conf) |