summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>2013-09-06 09:44:01 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-20 23:45:06 +0200
commitde1f9bdc153176116902e8766e6c46ab6150eda4 (patch)
tree348692680446602c4d6e7fa5f4f54d10f19b6014
parent5a7da37be5054020b8a964162d83b37e86ee2175 (diff)
Android: Never error out on literal-suffix warning
When warnings are treated as errors, no Android code will compile, since one of the platform headers in the NDK triggers the literal-suffix warning. So we need to mark this as no-error. Change-Id: Icabf1c2f2d32f76ee157d04e62a28f83abeed8f1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--mkspecs/features/qt_common.prf4
1 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index da4e27de38..746e2878a7 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -51,7 +51,11 @@ warnings_are_errors:warning_clean {
# GCC prints this bogus warning, after it has inlined a lot of code
# error: assuming signed overflow does not occur when assuming that (X + c) < X is always false
QMAKE_CXXFLAGS += -Wno-error=strict-overflow
+
+ # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135
+ android: QMAKE_CXXFLAGS += -Wno-error=literal-suffix
}
}
unset(ver)
}
+