summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-09-28 12:56:03 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-09-28 13:38:50 (GMT)
commitac1b42cefbfde3a5f7fc510198f22098a7c7ae27 (patch)
treeb1c93d47cda2aaf90d77f48a8cf07dba4d3883a6
parent13068688035914454c82eb956c75365e73c8caa4 (diff)
downloadQt-ac1b42cefbfde3a5f7fc510198f22098a7c7ae27.zip
Qt-ac1b42cefbfde3a5f7fc510198f22098a7c7ae27.tar.gz
Qt-ac1b42cefbfde3a5f7fc510198f22098a7c7ae27.tar.bz2
Mac: backport efd84105355 to silence visibility warnings
Make sure that we build objective c files with visibility hidden as default Reviewed-by: prasanth (cherry picked from commit b798fc523446b4b7c7e888f7ef504202730e6cb5)
-rw-r--r--mkspecs/features/mac/objective_c.prf3
1 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/features/mac/objective_c.prf b/mkspecs/features/mac/objective_c.prf
index 0a73af9..0df7013 100644
--- a/mkspecs/features/mac/objective_c.prf
+++ b/mkspecs/features/mac/objective_c.prf
@@ -1,6 +1,5 @@
isEmpty(QMAKE_OBJECTIVE_CC):QMAKE_OBJECTIVE_CC = $$QMAKE_CC
-isEmpty(QMAKE_OBJECTIVE_CFLAGS) { #bootstrap
QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS
QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
@@ -9,7 +8,7 @@ isEmpty(QMAKE_OBJECTIVE_CFLAGS) { #bootstrap
QMAKE_OBJECTIVE_CFLAGS_X86 = $$QMAKE_CFLAGS_X86
QMAKE_OBJECTIVE_CFLAGS_PPC = $$QMAKE_CFLAGS_PPC
QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS
-}
+
OBJECTIVE_C_OBJECTS_DIR = $$OBJECTS_DIR
isEmpty(OBJECTIVE_C_OBJECTS_DIR):OBJECTIVE_C_OBJECTS_DIR = .
isEmpty(QMAKE_EXT_OBJECTIVE_C):QMAKE_EXT_OBJECTIVE_C = .mm .m