[patched-9] Backport recent changes from MeVisLab/pythonqt (Part 2)

README.md

@@ -1,17 +1,21 @@
 # PythonQt
+
 [![License](https://img.shields.io/github/license/mevislab/pythonqt.svg?color=blue)](LICENSE)
 
 PythonQt is a dynamic [Python](https://www.python.org) binding for [Qt](https://www.qt.io).
 It offers an easy way to embed the Python scripting language into
 your Qt applications.
 
 # Documentation
+
 API documentation is available at: https://mevislab.github.io/pythonqt
 
 # Licensing
+
 PythonQt is distributed under the `LGPL 2.1` license.
 
 ## Licensing of Generator
+
 The build system of PythonQt makes use of a patched version of the LGPL'ed QtScript
 generator, located in the `generator` directory.
 
@@ -26,3 +30,18 @@ The generated wrappers are pre-generated and checked-in, so you only
 need to build and run the generator when you want to build additional wrappers
 or you want to upgrade/downgrade to another Qt version, but this requires
 updating the typesystems as well.
+
+# Building
+
+## Building on Windows with MinGW
+
+To build PythonQt, you need to set the environment variable `PYTHON_PATH` to
+point to the root dir of the python installation. Then you should set the
+`PYTHON_VERSION` variable to the Python version number.
+
+When using the prebuild Python installer, this will be:
+
+```cmd
+set PYTHON_PATH=c:\Python310
+set PYTHON_VERSION=3.10
+```

build/python.prf

@@ -1,12 +1,12 @@
 # profile to include and link Python
 
 
-# Change this variable to your python version (2.6, 2.7, 3.3, ...)
+# Change this variable to your python version (3.7, 3.8, ...)
 isEmpty( PYTHON_VERSION ) {
   PYTHON_VERSION=$$(PYTHON_VERSION)
 }
 isEmpty( PYTHON_VERSION ) {
-  PYTHON_VERSION=2.7
+  PYTHON_VERSION=3.10
 }
 
 isEmpty( PYTHON_DIR ) {
@@ -36,7 +36,7 @@ equals(PYTHON_VERSION_MAJOR, 2) {
 }
 
 contains(PKGCONFIG, "python.*"){
-# If `pkg-config` is configured, use `qmake PKGCONFIG+=python3.8-embed CONFIG+=...`
+# If `pkg-config` is configured, use `qmake PKGCONFIG+=python3.10-embed CONFIG+=...`
 # or `PKGCONFIG+=python2.7m`-like form for older versions,
 # see `pkg-config --list-all | grep python` for details.
 # This can help with GNU/Linux (including macOS with Homebrew), MSYS2/MinGW environment,
@@ -54,16 +54,12 @@ contains(PKGCONFIG, "python.*"){
   # for windows install a Python development kit or build Python yourself from the sources
   # Make sure that you set the environment variable PYTHON_PATH to point to your
   # python installation (or the python sources/header files when building from source).
-  # Make sure that you set the environment variable PYTHON_LIB to point to
-  # the directory where the python libs are located.
   #
   # When using the prebuild Python installer, this will be:
-  # set PYTHON_PATH = c:\Python26
-  # set PYTHON_LIB  = c:\Python26\libs
+  # set PYTHON_PATH = c:\Python310
   #
   # When using the python sources, this will be something like:
-  # set PYTHON_PATH = c:\yourDir\Python-2.6.1\
-  # set PYTHON_LIB  = c:\yourDir\Python-2.6.1\PCbuild8\Win32
+  # set PYTHON_PATH = c:\yourDir\Python-3.10.12\
 
   # check if debug or release
   CONFIG(debug, debug|release) {