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

src/qt/apptraits.cpp

@@ -0,0 +1,63 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/apptraits.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/apptrait.h"
+#include "wx/stdpaths.h"
+#include "wx/evtloop.h"
+
+#include "wx/qt/timer.h"
+
+#include <QtGlobal>
+
+wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop();
+}
+
+#if wxUSE_TIMER
+wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+    return new wxQtTimerImpl( timer );
+}
+#endif
+
+// #if wxUSE_THREADS
+// void wxGUIAppTraits::MutexGuiEnter()
+// {
+// }
+// 
+// void wxGUIAppTraits::MutexGuiLeave()
+// {
+// }
+
+// #endif
+
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
+{
+    if ( majVer )
+        *majVer = QT_VERSION >> 16;
+    if ( minVer )
+        *minVer = (QT_VERSION >> 8) & 0xFF;
+
+    return wxPORT_QT;
+}
+
+//#############################################################################
+
+#if wxUSE_CONSOLE_EVENTLOOP
+
+wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop();
+}
+
+#endif
+
+//#############################################################################