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
This commit is contained in:
Vadim Zeitlin
2014-08-24 01:50:11 +00:00
parent d513d3e2f0
commit df13791078
381 changed files with 24333 additions and 938 deletions

View File

@@ -54,6 +54,7 @@ There is some support for the following platforms:
- Most Unix variants with X11
- Most Unix variants with Motif/Lesstif
- Most Unix variants with GTK+ 1.2
- Most Unix variants with Qt 5 or newer
Most popular C++ compilers are supported; see the install.txt
file for each platform (available via docs/html/index.htm) and
@@ -114,9 +115,9 @@ application binaries. To answer a FAQ, you don't have to
distribute any source if you wish to write commercial
applications using wxWidgets.
However, if you distribute wxGTK or wxMotif (with Lesstif)
However, if you distribute wxGTK, wxQt or wxMotif (with Lesstif)
version of your application, don't forget that it is linked
against GTK+ (or Lesstif) which is covered by LGPL *without*
against GTK+, Qt or Lesstif, which are covered by LGPL *without*
exception notice and so is bound by its requirements.
If you use TIFF image handler, please see src/tiff/COPYRIGHT
@@ -174,4 +175,4 @@ If you are looking for support, you can get it from
Have fun!
The wxWidgets Team, November 2013
The wxWidgets Team, August 2014