merge with qt.git#4.8

[Espen Riskedal]

On Wed, Aug 10, 2011 at 10:34 AM, Thomas Senyk <thomas.senyk at nokia.com> wrote:
> I saw the same problem.
>
> But: platform-9 shouldn't use
> src/plugins/platforms/android/src/native/graphics/jni/bitmap.cpp

I'm actually not sure if it's using the one above or the one from the
NDK, I was just assuming it was. This would be the first to check.
Just by grepping it seems OK:

espen at droid:~/dev/android-qt$ git grep bitmap.cpp | grep -v qbitmap
src/plugins/platforms/android/opengl/androidGL-5/androidGL-5.pro:SOURCES
+= $$QT_SOURCE_TREE/src/plugins/platforms/android/src/native/graphics/jni/bitmap.cpp
src/plugins/platforms/android/raster/android-4/android-4.pro:SOURCES
+= $$QT_SOURCE_TREE/src/plugins/platforms/android/src/native/graphics/jni/bitmap.cpp
src/plugins/platforms/android/raster/android-5/android-5.pro:SOURCES
+= $$QT_SOURCE_TREE/src/plugins/platforms/android/src/native/graphics/jni/bitmap.cpp

> It (all >=8) should use the one from the ndk, shouldn't it?

Yes. Perhaps it's simply the fact that I've got:
  ANDROID_PLATFORM=5
  ANDROID_NDK_PLATFORM=android-5
set when I compile (it's the default of the build script) and this
somehow confuses the build script when building the higher version
raster plugins (like 8 and 9)?.

I see that src/plugins/platforms/android/src/androidjnimain.cpp uses:
   #include <android/api-level.h>
and then later:
   #if __ANDROID_API__ > 8
but that seems fine as the .pro files for the plugins include the
right NDKs platform usr/include:

espen at droid:~/dev/android-qt$ git grep NDK_ROOT | grep plugins | grep INCLUDE
src/plugins/platforms/android/opengl/androidGL-5/androidGL-5.pro:INCLUDEPATH
+= $$NDK_ROOT/platforms/android-5/arch-arm/usr/include
src/plugins/platforms/android/opengl/androidGL-8/androidGL-8.pro:INCLUDEPATH
+= $$NDK_ROOT/platforms/android-8/arch-arm/usr/include
src/plugins/platforms/android/opengl/androidGL-9/androidGL-9.pro:
INCLUDEPATH += $$NDK_ROOT/platforms/android-9/arch-$$ANDROID_ARCHITECTURE/usr/include
src/plugins/platforms/android/raster/android-5/android-5.pro:INCLUDEPATH
+= $$NDK_ROOT/platforms/android-5/arch-arm/usr/include
src/plugins/platforms/android/raster/android-8/android-8.pro:INCLUDEPATH
+= $$NDK_ROOT/platforms/android-8/arch-arm/usr/include
src/plugins/platforms/android/raster/android-9/android-9.pro:
INCLUDEPATH += $$NDK_ROOT/platforms/android-9/arch-$$ANDROID_ARCHITECTURE/usr/include
(Note some are still hardcoded to arch-arm)

Hmm, will check some more.

espen