1 diff --git a/android/androidconfigbuild.sh b/android/androidconfigbuild.sh
2 index 12ad414..b78f907 100755
3 --- a/android/androidconfigbuild.sh
4 +++ b/android/androidconfigbuild.sh
5 @@ -281,7 +281,7 @@ then
7 $SRC_DIR_QT/configure -v -opensource -qpa -arch $ANDROID_ARCHITECTURE \
8 -no-phonon -freetype -fast -xplatform android-g++ \
9 - -host-arch i386 $PLATFORM -host-little-endian \
11 -little-endian -no-qt3support -no-largefile \
13 -nomake demos -no-multimedia -nomake examples -confirm-license \
14 diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
15 index db28cb6..bc8802f 100644
16 --- a/mkspecs/android-g++/qmake.conf
17 +++ b/mkspecs/android-g++/qmake.conf
18 @@ -74,8 +74,8 @@ ANDROID_PLATFORM_PATH = $$ANDROID_PLATFORM_ROOT_PATH/usr
19 QMAKE_ANDROID_PLATFORM_INCDIR = $$NDK_ROOT/platforms/$$ANDROID_PLATFORM/arch-$$ANDROID_ARCHITECTURE/usr/include
20 QMAKE_ANDROID_PLATFORM_LIBDIR = $$NDK_ROOT/platforms/$$ANDROID_PLATFORM/arch-$$ANDROID_ARCHITECTURE/usr/lib
22 -ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl$$ANDROID_CXXSTL_SUFFIX/gnu-libstdc++/libs/$$ANDROID_TARGET_ARCH
23 -ANDROID_SOURCES_CXX_STL_INCDIR = $$NDK_ROOT/sources/cxx-stl$$ANDROID_CXXSTL_SUFFIX/gnu-libstdc++/include $$ANDROID_SOURCES_CXX_STL_LIBDIR/include
24 +ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/libs/$$ANDROID_TARGET_ARCH
25 +ANDROID_SOURCES_CXX_STL_INCDIR = $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/include $$ANDROID_SOURCES_CXX_STL_LIBDIR/include
27 # modifications to g++.conf
28 QMAKE_CC = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-gcc
29 @@ -159,7 +159,7 @@ QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined
30 QMAKE_LFLAGS_RPATH = -Wl,-rpath=
33 -QMAKE_LIBS = -lstdc++ -lsupc++ -llog -lz -lm -ldl -lc -lgcc
34 +QMAKE_LIBS = -lgnustl_shared -lstdc++ -lsupc++ -llog -lz -lm -ldl -lc -lgcc
37 QMAKE_LIBS_QT_THREAD =
38 diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
39 index 9309db1..1df9f06 100644
40 --- a/src/tools/moc/moc.cpp
41 +++ b/src/tools/moc/moc.cpp
42 @@ -525,12 +525,18 @@ void Moc::parse()
45 if (test(IDENTIFIER)) {
46 + QByteArray name = lexem();
47 + if (index + 1 < symbols.size() && symbols.at(index).token == IDENTIFIER &&
48 + symbols.at(index).lexem() == "_GLIBCXX_VISIBILITY" &&
49 + symbols.at(index+1).token == LPAREN) {
53 // namespace Foo = Bar::Baz;
55 } else if (!test(SEMIC)) {
60 def.begin = index - 1;