diff options
| author | Jukka Jokiniva <jukka.jokiniva@qt.io> | 2019-08-27 07:48:19 +0300 |
|---|---|---|
| committer | Jukka Jokiniva <jukka.jokiniva@qt.io> | 2019-08-27 07:50:18 +0300 |
| commit | b29fb929bbf073e9694340334ff38f15aa9da5bd (patch) | |
| tree | 94a7ebd6a9eb2c3ca806124a766b7082c9a5c35c | |
| parent | 28958dfae22cc6e52dfb71c4b00c20aba72531a1 (diff) | |
| parent | ffecd65abe4519bcaad29e0c59dc9a8353f6f68d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Id820dfc57338b9630b77448a697aa9da029ddadf
| -rw-r--r-- | README.pyside2.md | 6 | ||||
| -rw-r--r-- | build_scripts/config.py | 1 | ||||
| -rw-r--r-- | build_scripts/main.py | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/README.pyside2.md b/README.pyside2.md index f1bd8aaa4..94cdd16e3 100644 --- a/README.pyside2.md +++ b/README.pyside2.md @@ -69,3 +69,9 @@ our [guidelines](https://wiki.qt.io/Qt_for_Python/Reporting_Bugs). Check *#qt-pyside*, our official IRC channel on FreeNode, or contact us via our [mailing list](http://lists.qt-project.org/mailman/listinfo/pyside). + +### Licensing + +PySide2 is available under both Open Source (LGPLv3/GPLv2) and commercial license. +Using PyPi is the recommended installation source, because the content of the wheels is valid for both cases. +For more information, refer to the [Qt Licensing page](https://www.qt.io/licensing/). diff --git a/build_scripts/config.py b/build_scripts/config.py index cad4e2f57..25036a65f 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -174,6 +174,7 @@ class Config(object): 'Environment :: Win32 (MS Windows)', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', + 'License :: Other/Proprietary License', 'Operating System :: MacOS :: MacOS X', 'Operating System :: POSIX', 'Operating System :: POSIX :: Linux', diff --git a/build_scripts/main.py b/build_scripts/main.py index 4d9f95b14..05e9b0f72 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -1056,7 +1056,7 @@ class PysideBuild(_build): OPTION_MACOS_SYSROOT)) else: latest_sdk_path = run_process_output(['xcrun', - '--show-sdk-path']) + '--sdk', 'macosx', '--show-sdk-path']) if latest_sdk_path: latest_sdk_path = latest_sdk_path[0] cmake_cmd.append("-DCMAKE_OSX_SYSROOT={}".format( |