diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-06-15 08:42:42 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-06-15 08:44:01 (GMT) |
| commit | 11420641d9341af6615baa21453e08c092f7fb10 (patch) | |
| tree | d736b73e44d2381b7c458b39323649ca87a97eb1 | |
| parent | 737228356870569d264e0719cd285e0ec906e24a (diff) | |
| download | Qt-11420641d9341af6615baa21453e08c092f7fb10.zip Qt-11420641d9341af6615baa21453e08c092f7fb10.tar.gz Qt-11420641d9341af6615baa21453e08c092f7fb10.tar.bz2 | |
Fix symbian building of TARGET with a slash
In case there is a slash in the target (for example; ../foo) then we
don't want to add a faulty cxxflags to the compile line.
Reviewed-by: Axis
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 4 | ||||
| -rw-r--r-- | tests/auto/qlocale/test/test.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 92988aa..9fc4d1e 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -1,7 +1,7 @@ # we have some module specific options (defined in qt.prf) lets add them -!contains(TARGET, ".*[ -].*"):eval(TMPVAR = \$\$QMAKE_$${TARGET}_CXXFLAGS) +!contains(TARGET, ".*[ -/].*"):eval(TMPVAR = \$\$QMAKE_$${TARGET}_CXXFLAGS) !isEmpty(TMPVAR):QMAKE_CXXFLAGS += $$TMPVAR -!contains(TARGET, ".*[ -].*"):eval(TMPVAR = \$\$QMAKE_$${TARGET}_LFLAGS) +!contains(TARGET, ".*[ -/].*"):eval(TMPVAR = \$\$QMAKE_$${TARGET}_LFLAGS) !isEmpty(TMPVAR) { QMAKE_LFLAGS += $$TMPVAR } else :linux-gcce { # lets provide a simple default. Without elf2e32 complains diff --git a/tests/auto/qlocale/test/test.pro b/tests/auto/qlocale/test/test.pro index d57f2d1..e33d0fe 100644 --- a/tests/auto/qlocale/test/test.pro +++ b/tests/auto/qlocale/test/test.pro @@ -36,4 +36,4 @@ symbian:contains(S60_VERSION,3.2) { "PAGED" \ "$${LITERAL_HASH}endif" MMP_RULES += custom_paged_rule -}
\ No newline at end of file +} |