diff options
| author | axis <qt-info@nokia.com> | 2010-07-01 15:09:43 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-07-02 13:31:22 (GMT) |
| commit | ad82e439c735912d069a2cf456b04e3d10016e84 (patch) | |
| tree | ff8f1fae53be3b5af6fab31e8d1bfe72b0860f32 /mkspecs/features/symbian/symbian_building.prf | |
| parent | e4616afabbdccdbd6f53e5c96086bd4065af9227 (diff) | |
| download | Qt-ad82e439c735912d069a2cf456b04e3d10016e84.zip Qt-ad82e439c735912d069a2cf456b04e3d10016e84.tar.gz Qt-ad82e439c735912d069a2cf456b04e3d10016e84.tar.bz2 | |
Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.
Task: QTBUG-11396
RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs/features/symbian/symbian_building.prf')
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index c4088ca..ce124ec 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -1,7 +1,11 @@ +# We need a target name without the INFIX'ed part, since flags are not infixed. +equals(QMAKE_TARGET_PRODUCT, Qt4):clean_TARGET = $$replace(TARGET, "$${QT_LIBINFIX}$", "") +else:clean_TARGET = $$TARGET + # we have some module specific options (defined in qt.prf) lets add them -!contains(TARGET, ".*[ -/].*"):eval(TMPVAR = \$\$QMAKE_$${TARGET}_CXXFLAGS) +!contains(clean_TARGET, ".*[ -/].*"):eval(TMPVAR = \$\$QMAKE_$${clean_TARGET}_CXXFLAGS) !isEmpty(TMPVAR):QMAKE_CXXFLAGS += $$TMPVAR -!contains(TARGET, ".*[ -/].*"):eval(TMPVAR = \$\$QMAKE_$${TARGET}_LFLAGS) +!contains(clean_TARGET, ".*[ -/].*"):eval(TMPVAR = \$\$QMAKE_$${clean_TARGET}_LFLAGS) !isEmpty(TMPVAR) { QMAKE_LFLAGS += $$TMPVAR } else :linux-gcce { # lets provide a simple default. Without elf2e32 complains |