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
@@ -27,6 +27,9 @@ Changes in behaviour which may result in build errors
|
||||
3.1.0: (released 2014-xx-xx)
|
||||
----------------------------
|
||||
|
||||
- wxQt branch implementing Qt5-based port of wxWidgets API was merged into
|
||||
the trunk (Mariano Reingart, Google Summer of Code project).
|
||||
|
||||
All:
|
||||
|
||||
- Allow iterating over wxCmdLineParser arguments in order (Armel Asselin).
|
||||
|
||||
@@ -47,6 +47,7 @@
|
||||
<a href="mac/readme.txt">wxMac</a>,
|
||||
<a href="cocoa/readme.txt">wxCocoa</a>,
|
||||
<a href="motif/readme.txt">wxMotif</a>,
|
||||
<a href="qt/readme.txt">wxQt</a>
|
||||
<a href="x11/readme.txt">wxX11</a>,
|
||||
<a href="univ/readme.txt">Univ</a>
|
||||
</li>
|
||||
@@ -57,6 +58,7 @@
|
||||
<a href="x11/install.txt">wxX11</a>,
|
||||
<a href="mac/install.txt">wxMac</a>,
|
||||
<a href="cocoa/install.txt">wxCocoa</a>,
|
||||
<a href="qt/install.txt">wxQt</a>,
|
||||
</li>
|
||||
<li><a href="changes.txt"><b>General change log</b></a></li>
|
||||
<li>Licence:
|
||||
|
||||
175
docs/qt/install.txt
Normal file
175
docs/qt/install.txt
Normal file
@@ -0,0 +1,175 @@
|
||||
wxWidgets for Qt installation
|
||||
-----------------------------
|
||||
|
||||
IMPORTANT NOTE:
|
||||
|
||||
If you experience problems installing, please re-read these
|
||||
instructions and other related files (todo.txt, bugs.txt and
|
||||
osname.txt for your platform if it exists) carefully before
|
||||
mailing wxwin-users or the author. Preferably, try to fix the
|
||||
problem first and then send a patch to the author.
|
||||
|
||||
When sending bug reports tell us what version of wxWidgets you are
|
||||
using (including the beta) and what compiler on what system. One
|
||||
example: wxQt 3.1.0, GCC 4.8.1, Ubuntu 14.04
|
||||
|
||||
* The simplest case
|
||||
-------------------
|
||||
|
||||
If you compile wxWidgets on Linux for the first time and don't like to read
|
||||
install instructions just do (in the base dir):
|
||||
|
||||
> mkdir buildqt
|
||||
> cd buildqt
|
||||
> ../configure --with-qt
|
||||
> make
|
||||
> su <type root password>
|
||||
> make install
|
||||
> ldconfig
|
||||
[if you get "ldconfig: command not found", try using "/sbin/ldconfig"]
|
||||
|
||||
If you don't do the 'make install' part, you can still use the libraries from
|
||||
the buildgtk directory, but they may not be available to other users.
|
||||
|
||||
If you want to remove wxWidgets on Unix you can do this:
|
||||
|
||||
> su <type root password>
|
||||
> make uninstall
|
||||
> ldconfig
|
||||
|
||||
* The simplest errors
|
||||
---------------------
|
||||
|
||||
For any configure errors: please look at config.log file which was generated
|
||||
during configure run, it usually contains some useful information.
|
||||
|
||||
configure reports, that you don't have Qt installed although you are very
|
||||
sure you have. Well, you have installed it, but you also have another
|
||||
version of the Qt installed, which you may need to remove. Or maybe you
|
||||
installed it in a non-default location and configure can't find it there,
|
||||
so please check that your PATH variable includes the path to the correct
|
||||
qtconfig/pkg-config. Also check that your LD_LIBRARY_PATH or equivalent
|
||||
variable contains the path to Qt libraries if they were installed in a
|
||||
non-default location.
|
||||
|
||||
* The simplest program
|
||||
----------------------
|
||||
|
||||
Now create your super-application myfoo.cpp and compile anywhere with
|
||||
|
||||
g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
|
||||
|
||||
* GUI libraries
|
||||
---------------
|
||||
|
||||
wxWidgets/Qt requires the Qt library to be installed on your system. It has
|
||||
to be a stable version, preferably Qt 5.2.1 or later.
|
||||
|
||||
* Building wxQT on Ubuntu
|
||||
-------------------------
|
||||
|
||||
Install latest Qt5 packages (qt5-default). To build unit tests, libcppunit-dev
|
||||
is required. You will need to install other dependencies to compile wxWidgets
|
||||
depending on the features you'll want to use (build-essential libjpeg-dev
|
||||
libtiff5-dev ubuntu-restricted-extras freeglut3 freeglut3-dev libsdl1.2-dev
|
||||
libgstreamer-plugins-base0.10-dev)
|
||||
|
||||
|
||||
Then create a build directory, configure and compile:
|
||||
|
||||
mkdir bldqt5
|
||||
cd bldqt5
|
||||
../configure --with-qt --enable-debug
|
||||
make
|
||||
make samples
|
||||
|
||||
If everything is ok, you can do the make install as specified before.
|
||||
|
||||
Optionally, you can build and run Unit Tests:
|
||||
|
||||
cd tests
|
||||
make
|
||||
./test_gui
|
||||
|
||||
* Building wxGT on Android
|
||||
--------------------------
|
||||
|
||||
Download Android Native Development Kit (NDK), tandalone Android Software
|
||||
Development Kit (SDK), install them and perform the following instructions to
|
||||
prepare the cross-compilation tool-chain to (change NDK and other paths):
|
||||
|
||||
NDK=~/src/android-ndk-r9d
|
||||
SDK=~/src/android-sdk-linux
|
||||
export ANDROID_NDK_ROOT=$NDK
|
||||
$NDK/build/tools/make-standalone-toolchain.sh \
|
||||
--toolchain=arm-linux-androideabi-4.8 --platform=android-9 \
|
||||
--install-dir=/tmp/ndk
|
||||
|
||||
export PATH=/tmp/ndk/bin:$PATH
|
||||
export CC=arm-linux-androideabi-gcc
|
||||
export CXX=arm-linux-androideabi-g++
|
||||
|
||||
|
||||
Also, you'll need to download the Qt library bundle that matches your operating
|
||||
system installed package (5.2.1 in this case installed in ~/src/qt, you'll need
|
||||
the android_armv5/ android_armv7/ android_x86/ pre-compiled folders to
|
||||
cross-compile for that architectures)
|
||||
|
||||
Then, create a build directory (under the wxWidgets folder), configure for
|
||||
Andrid (disable currently unsupported/uneeded features) and run make:
|
||||
|
||||
cd ~/src/wxWidgets
|
||||
mkdir bldqt5droid
|
||||
cd bldqt5droid
|
||||
../configure --with-qt --enable-debug --build=x86_64-unknown-linux-gnu \
|
||||
--host=arm-linux-androideabi --disable-compat28 --disable-shared \
|
||||
--disable-arttango --enable-image --disable-dragimage --disable-sockets \
|
||||
--with-libtiff=no --without-opengl --disable-baseevtloop --disable-utf8
|
||||
make
|
||||
|
||||
You can now compile and link your app against this build, and finally
|
||||
package it for Android using standard APK tools.
|
||||
|
||||
* Create your configuration
|
||||
---------------------------
|
||||
|
||||
Usage:
|
||||
./configure options
|
||||
|
||||
If you want to use system's C and C++ compiler,
|
||||
set environment variables CC and CXX as
|
||||
|
||||
% setenv CC cc
|
||||
% setenv CXX CC
|
||||
% ./configure [options]
|
||||
|
||||
to see all the options please use:
|
||||
|
||||
./configure --help
|
||||
|
||||
It is recommended to build wxWidgets in another directory (maybe a
|
||||
subdirectory of your wxWidgets installation) as this allows you to
|
||||
have multiple configurations (for example, debug and release or GTK
|
||||
and Motif) simultaneously.
|
||||
|
||||
* Feature Options
|
||||
-----------------
|
||||
|
||||
When producing an executable that is linked statically with wxQt
|
||||
you'll be surprised at its immense size. This can sometimes be
|
||||
drastically reduced by removing features from wxWidgets that
|
||||
are not used in your program.
|
||||
|
||||
Please see the output of "./configure --help" for comprehensive list
|
||||
of all configurable options.
|
||||
|
||||
Apart from disabling certain features you can very often "strip"
|
||||
the program of its debugging information resulting in a significant
|
||||
reduction in size.
|
||||
|
||||
----------------------
|
||||
|
||||
In the hope that it will be useful,
|
||||
|
||||
The wxWidgets Team
|
||||
|
||||
52
docs/qt/readme.txt
Normal file
52
docs/qt/readme.txt
Normal file
@@ -0,0 +1,52 @@
|
||||
Welcome to wxWidgets for Qt
|
||||
---------------------------
|
||||
|
||||
You have downloaded the Qt port of the wxWidgets GUI library.
|
||||
|
||||
It is required to use at least Qt 5 and some features are
|
||||
only available when using Qt 5.2 or higher.
|
||||
|
||||
More info about the wxWidgets project (including all the
|
||||
other ports and version of wxWidgets) can be found at the
|
||||
main wxWidgets homepage at:
|
||||
|
||||
http://www.wxwidgets.org/
|
||||
|
||||
Information on how to install can be found in the file
|
||||
INSTALL.txt, but if you cannot wait, this should work on
|
||||
many systems:
|
||||
|
||||
mkdir build_qt
|
||||
cd build_qt
|
||||
../configure --with-qt
|
||||
make
|
||||
su <type root password>
|
||||
make install
|
||||
ldconfig
|
||||
|
||||
Please note that it is strongly advised to build the library in
|
||||
a separate directory, as shown above, as it allows you to have
|
||||
different builds of it (for example with and without debug) in
|
||||
parallel. If you build in the source directory, don't forget to
|
||||
do "make clean" before changing the configuration!
|
||||
|
||||
When you run into problems, please read the INSTALL.txt and
|
||||
follow those instructions. If you still don't have any success,
|
||||
please send a bug report to one of our mailing list, INCLUDING
|
||||
A DESCRIPTION OF YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR
|
||||
VERSION OF GTK, WXGTK, WHAT DISTRIBUTION YOU USE AND WHAT ERROR
|
||||
WAS REPORTED. I know this has no effect, but I tried...
|
||||
|
||||
Please send problems concerning installation, feature requests,
|
||||
bug reports or comments to the wxWidgets users list. These can
|
||||
be found at http://www.wxwidgets.org and more specifically at
|
||||
http://lists.wxwidgets.org.
|
||||
|
||||
wxWidgets doesn't come with any guarantee whatsoever. It
|
||||
might crash your harddisk or destroy your monitor. It doesn't
|
||||
claim to be suitable for any special or general purpose.
|
||||
|
||||
Regards,
|
||||
|
||||
The wxWidgets Team
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user