summaryrefslogtreecommitdiffstats
path: root/mkspecs/linux-arm-gnueabi-g++/qmake.conf
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2012-05-03 14:38:45 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-05-03 14:57:35 (GMT)
commit0ba35fd5a81df57fb0f943c3dddd35d43ebc3383 (patch)
tree500d7121d09ba477b15d6f699805f669185035fe /mkspecs/linux-arm-gnueabi-g++/qmake.conf
parent1565d4a6337a67fbc3e892664e02465230817c40 (diff)
downloadQt-0ba35fd5a81df57fb0f943c3dddd35d43ebc3383.zip
Qt-0ba35fd5a81df57fb0f943c3dddd35d43ebc3383.tar.gz
Qt-0ba35fd5a81df57fb0f943c3dddd35d43ebc3383.tar.bz2
mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.
Commit ae2060dc56501ab387863757c3fd90d5cfed7dd2 has made the freebsd-g++46 mkspec use g++-base.conf, which on its turn resets QMAKE_CC and QMAKE_CXX to other values. Redefine them to gcc46 and g++46, respectively (and fix the linker values) after the inclusion of g++-unix.conf so the settings are not lost. Cherry-picked from f42a61e76ac209db0bfeefdb03de22ce26b422bf to qt5/qtbase. Change-Id: I005bab3bc79ca3a0dc1b2d3a70d058b77c304f46 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/linux-arm-gnueabi-g++/qmake.conf')
0 files changed, 0 insertions, 0 deletions