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/taskbar.cpp

@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/taskbar.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/taskbar.h"
+
+//=============================================================================
+
+bool wxTaskBarIconBase::IsAvailable()
+{
+    return QSystemTrayIcon::isSystemTrayAvailable();
+}
+
+//=============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS( wxTaskBarIcon, wxTaskBarIconBase )
+
+wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))
+{
+}
+
+bool wxTaskBarIcon::SetIcon(const wxIcon& WXUNUSED(icon),
+             const wxString& WXUNUSED(tooltip))
+{
+    return false;
+}
+
+bool wxTaskBarIcon::RemoveIcon()
+{
+    return false;
+}
+
+bool wxTaskBarIcon::PopupMenu(wxMenu *WXUNUSED(menu))
+{
+    return false;
+}
+