[Development] Reviews needed before android integration in two weeks

[Paul Olav Tvete]

One of the major features for Qt 5.1 is Android support. We have been doing 
the work in a feature branch, and are now getting ready to integrate to the 
dev branch. To beat the rush of integrations before feature freeze, we aim to 
start the integration in two weeks time.

Most of the changes are android-specific, but there are a few changes touching 
cross-platform code. To make the integration go smootly, we ask approvers and 
maintainers to check the android changes in their areas now, so we can fix any 
problems before the merge. To see the changes, check out (or diff against) the 
"wip/android" branch.

I have appended a list of changed files for the following repositories:
qtsensors
qtdeclarative
qtbase

We also have changes in qtmultimedia, but those will probably be merged 
independently.


We urge you to check your area for changes within the coming two weeks. Once 
the merge commit is created, we aim to integrate it immediately, so there will 
not be room for a lot of discussion at that point.

On behalf of the Qt for Android team,

- Paul
-------------- next part --------------
qtdeclarative

M	src/quick/items/qquickitem.cpp
M	src/quick/items/qquicktextedit.cpp
M	src/quick/items/qquicktextedit_p_p.h
M	src/quick/items/qquicktextinput.cpp


qtsensors

A       src/plugins/sensors/android/...
M       src/plugins/sensors/blackberry/main.cpp
M       src/plugins/sensors/dummy/main.cpp
M       src/plugins/sensors/generic/main.cpp
M       src/plugins/sensors/linux/main.cpp
M       src/plugins/sensors/sensors.pro
M       src/plugins/sensors/simulator/main.cpp
M       src/sensors/qsensormanager.cpp
M       src/sensors/qsensorplugin.h

qtbase

M	config.tests/qpa/linuxfb/linuxfb.cpp
M	config.tests/unix/arch.test
M	config.tests/unix/compile.test
M	config.tests/unix/evdev/evdev.cpp
M	config.tests/unix/getaddrinfo/getaddrinfotest.cpp
A	config.tests/unix/ipc_android/ipc.cpp
A	config.tests/unix/ipc_android/ipc_android.pro
M	config.tests/unix/makeabs
M	configure
A	lib/rules.xml
A	mkspecs/android-g++/qmake.conf
A	mkspecs/android-g++/qplatformdefs.h
D	mkspecs/common/android/qplatformdefs.h
D	mkspecs/common/linux-android.conf
A	mkspecs/features/android.prf
A	mkspecs/features/java.prf
M	mkspecs/features/moc.prf
A	mkspecs/features/qpa/android.prf
M	mkspecs/features/qpa/genericunixfontdatabase.prf
M	mkspecs/features/qt_functions.prf
M	mkspecs/features/qt_parts.prf
M	mkspecs/features/resources.prf
M	mkspecs/features/static.prf
D	mkspecs/unsupported/linux-android-armeabi-g++/qmake.conf
D	mkspecs/unsupported/linux-android-armeabi-g++/qplatformdefs.h
D	mkspecs/unsupported/linux-android-armeabi-v7a-g++/qmake.conf
D	mkspecs/unsupported/linux-android-armeabi-v7a-g++/qplatformdefs.h
D	mkspecs/unsupported/linux-android-x86-g++/qmake.conf
D	mkspecs/unsupported/linux-android-x86-g++/qplatformdefs.h
M	qmake/generators/makefile.cpp
M	qmake/generators/unix/unixmake2.cpp
M	qmake/generators/win32/mingw_make.cpp
M	qmake/generators/win32/msvc_nmake.cpp
M	qtbase.pro
A	src/android/...
M	src/corelib/arch/arch.pri
A	src/corelib/arch/qatomic_android.h
M	src/corelib/codecs/qiconvcodec.cpp
M	src/corelib/codecs/qiconvcodec_p.h
M	src/corelib/codecs/qtextcodec.cpp
M	src/corelib/codecs/qtextcodec_p.h
M	src/corelib/global/qglobal.cpp
M	src/corelib/global/qlogging.cpp
M	src/corelib/global/qnamespace.h
M	src/corelib/global/qnamespace.qdoc
M	src/corelib/global/qsystemdetection.h
M	src/corelib/io/qabstractfileengine_p.h
M	src/corelib/io/qfilesystemengine_unix.cpp
M	src/corelib/io/qfsfileengine_unix.cpp
M	src/corelib/io/qtemporarydir.cpp
M	src/corelib/kernel/kernel.pri
M	src/corelib/kernel/qeventdispatcher_unix.cpp
M	src/corelib/kernel/qeventdispatcher_unix_p.h
M	src/corelib/kernel/qsharedmemory.cpp
D	src/corelib/kernel/qsharedmemory_android.cpp
A	src/corelib/kernel/qsharedmemory_ashmem.cpp
M	src/corelib/kernel/qsharedmemory_p.h
M	src/corelib/kernel/qsystemsemaphore.cpp
M	src/corelib/kernel/qsystemsemaphore_android.cpp
M	src/corelib/kernel/qsystemsemaphore_p.h
M	src/corelib/thread/qbasicatomic.h
M	src/corelib/thread/qthread_unix.cpp
A	src/corelib/tools/android/cpu-features.c
A	src/corelib/tools/android/cpu-features.h
M	src/corelib/tools/qsimd.cpp
M	src/corelib/tools/qstring.h
M	src/corelib/tools/tools.pri
M	src/gui/image/qimage_neon.cpp
M	src/gui/kernel/qguiapplication.cpp
M	src/gui/kernel/qplatforminputcontext.cpp
M	src/gui/kernel/qplatforminputcontext.h
M	src/gui/kernel/qplatformmenu.h
M	src/gui/kernel/qplatformscreen.cpp
M	src/network/access/qnetworkaccessfilebackend.cpp
M	src/network/access/qnetworkaccessmanager.cpp
M	src/network/access/qnetworkreplyfileimpl.cpp
M	src/network/kernel/kernel.pri
M	src/network/kernel/qhostinfo_unix.cpp
M	src/network/kernel/qnetworkinterface_unix.cpp
M	src/network/kernel/qnetworkproxy_win.cpp
M	src/network/ssl/qsslcertificate.cpp
M	src/network/ssl/qsslsocket_openssl.cpp
M	src/network/ssl/ssl.pri
M	src/platformsupport/fbconvenience/qfbscreen.cpp
M	src/platformsupport/fbconvenience/qfbscreen_p.h
M	src/platformsupport/fbconvenience/qfbwindow.cpp
M	src/platformsupport/fbconvenience/qfbwindow_p.h
A	src/plugins/platforms/android/...
M	src/plugins/platforms/cocoa/qcocoamenu.h
M	src/plugins/platforms/cocoa/qcocoamenuitem.h
A	src/plugins/platforms/eglfs/eglfs.pri
M	src/plugins/platforms/eglfs/eglfs.pro
M	src/plugins/platforms/eglfs/qeglfshooks.h
M	src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
M	src/plugins/platforms/eglfs/qeglfsintegration.h
M	src/plugins/platforms/eglfs/qeglfswindow.cpp
M	src/plugins/platforms/eglfs/qeglfswindow.h
M	src/plugins/platforms/platforms.pro
M	src/printsupport/printsupport.pro
M	src/src.pro
M	src/tools/moc/moc.cpp
M	src/widgets/graphicsview/qgraphicsitem.cpp
M	src/widgets/itemviews/qitemdelegate.cpp
M	src/widgets/kernel/qwidget.cpp
A	src/widgets/styles/json/json.cpp
A	src/widgets/styles/json/json.g
A	src/widgets/styles/json/json.h
A	src/widgets/styles/json/json.pri
A	src/widgets/styles/json/jsonparser.cpp
A	src/widgets/styles/qandroidstyle.cpp
A	src/widgets/styles/qandroidstyle.h
M	src/widgets/styles/qcommonstyle.cpp
M	src/widgets/styles/qstylefactory.cpp
M	src/widgets/styles/styles.pri
M	src/widgets/widgets/qabstractbutton.cpp
M	src/widgets/widgets/qcombobox.cpp
M	src/widgets/widgets/qlineedit.cpp
M	src/widgets/widgets/qmenu.cpp
M	src/widgets/widgets/qplaintextedit.cpp
M	src/widgets/widgets/qtextbrowser.cpp
M	src/widgets/widgets/qtextedit.cpp
M	src/widgets/widgets/qwidgettextcontrol.cpp
A	tests/auto/android/...