Merge wxQT branch into the trunk.

This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/android/config_android.h

@@ -13,6 +13,12 @@
 // 'fine-tuned' on a trial-and-error basis. This means, no in-depth analysis
 // of Android docs / source was done.
 
+// For Qt under Android, use the default configuration procedure as most
+// features should be supported and the following fixed definitions will
+// cause compiler warnings or other issues.
+
+#if !defined(__WXQT__)
+
 #define wxUSE_UNIX 1
 #define __UNIX__ 1
 
@@ -53,3 +59,5 @@
 // Android doesn't support pthread_cancel().
 #undef HAVE_PTHREAD_CANCEL
 #endif
+
+#endif