Skip to content
Permalink
Browse files

[mxe] Fix typos and qt.conf

  • Loading branch information
elpaso committed Feb 8, 2018
1 parent 1dd6db3 commit b817a3f843ed09a240995590fc28f62638241923
Showing with 8 additions and 7 deletions.
  1. +3 −3 INSTALL
  2. +3 −3 ms-windows/mxe/README
  3. +2 −1 ms-windows/mxe/build-mxe.sh
@@ -1046,8 +1046,8 @@ take note of the path where you have installed mxe.
4.4.2. Building the dependencies
================================

Please see the README under ms-windows/mxe for a list of the dependencies that needs to be
build in mxe before attempting to build QGIS.
Please see the README under ms-windows/mxe for a list of the dependencies that need to be
built in mxe before attempting to build QGIS.


4.4.3. Cross-Building QGIS
@@ -1059,7 +1059,7 @@ can also change the build and release directory.
4.4.4. Testing QGIS
====================

Copy and unzip the release package ona a Windows machine and launch it!
Copy and unzip the release package on a Windows machine and launch it!


5. Building on MacOS X
@@ -7,8 +7,8 @@ For now, Python bindings cannot be built with mxe.
Follow the instructions on the website to prepare the mxe environment, you
will need to build all required dependencies for QGIS.

Note that someof the packages listed below are dependencies of other
packages, you will probably not need to build them all explicitely.
Note that some of the packages listed below are dependencies of other
packages, you will probably not need to build them all explicitly.


armadillo
@@ -117,4 +117,4 @@ tiff
xz
zlib

When done, you can edit the build-mxe.sh script to set the path to your mxe installation.
When done, you can edit the build-mxe.sh script to set the path to your mxe installation.
@@ -51,6 +51,7 @@ if [[ "$COMMAND" != *"package"* ]]; then

[ -d $BUILD_DIR ] || mkdir $BUILD_DIR
[ -d $RELEASE_DIR ] || mkdir $RELEASE_DIR
[ -d $RELEASE_DIR/qt5 ] || mkdir $RELEASE_DIR/qt5

fi

@@ -91,7 +92,7 @@ cp -r $MXE/usr/i686-w64-mingw32.shared/qt5/plugins $RELEASE_DIR/qt5

cat <<__TXT__ > ${RELEASE_DIR}/qt.conf
[Paths]
Plugins = ./qt5/plugins
Plugins = qt5
__TXT__


0 comments on commit b817a3f

Please sign in to comment.
You can’t perform that action at this time.