- # modifications to g++.conf
- QMAKE_CC = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-gcc
-@@ -159,7 +159,7 @@ QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined
- QMAKE_LFLAGS_RPATH = -Wl,-rpath=
-
-
--QMAKE_LIBS = -lstdc++ -lsupc++ -llog -lz -lm -ldl -lc -lgcc
-+QMAKE_LIBS = -lgnustl_shared -lstdc++ -lsupc++ -llog -lz -lm -ldl -lc -lgcc
- QMAKE_LIBS_X11 =
- QMAKE_LIBS_X11SM =
- QMAKE_LIBS_QT_THREAD =
-diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
-index 9309db1..1df9f06 100644
---- a/src/tools/moc/moc.cpp
-+++ b/src/tools/moc/moc.cpp
-@@ -525,12 +525,18 @@ void Moc::parse()
- case NAMESPACE: {
- int rewind = index;
- if (test(IDENTIFIER)) {
-+ QByteArray name = lexem();
-+ if (index + 1 < symbols.size() && symbols.at(index).token == IDENTIFIER &&
-+ symbols.at(index).lexem() == "_GLIBCXX_VISIBILITY" &&
-+ symbols.at(index+1).token == LPAREN) {
-+ until(RPAREN);
-+ }
- if (test(EQ)) {
- // namespace Foo = Bar::Baz;
- until(SEMIC);
- } else if (!test(SEMIC)) {
- NamespaceDef def;
-- def.name = lexem();
-+ def.name = name;
- next(LBRACE);
- def.begin = index - 1;
- until(RBRACE);