aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Tismer <ctismer@gmail.com>2015-09-25 19:57:27 +0200
committerChristian Tismer <ctismer@gmail.com>2015-09-25 19:57:27 +0200
commit0e0c887c619c119978c8e2ebbee305dfd2eacba1 (patch)
treedec7a06df4903d0ab2c271d4f03889c320032f2b
parenteace7b5ec4936b9b8afb3972eb72f7eb4c15093f (diff)
)small fixes (right wiki, name changes
-rw-r--r--README.md4
m---------sources/pyside216
m---------sources/shiboken213
3 files changed, 18 insertions, 15 deletions
diff --git a/README.md b/README.md
index 2ca20cfe..7caa1642 100644
--- a/README.md
+++ b/README.md
@@ -14,12 +14,12 @@ from any modern OSS project such as all code in a git repository and an open des
any contribution without requiring a transfer of copyright.
-PySide 2 supports Qt5. For building, please read about [gettting the dependencies](https://github.com/PySide/pyside-setup2/wiki/Dependencies). Then download the sources by running `git clone --recursive https://github.com/PySide/pyside2-setup.git`.
+PySide 2 supports Qt5. For building, please read about [gettting the dependencies](https://github.com/PySide/pyside2/wiki/Dependencies). Then download the sources by running `git clone --recursive https://github.com/PySide/pyside2-setup.git`.
###Building
####Windows
-On Windows, once you have gotten the dependencies and the source, `cd pyside-setup2.git` to enter the directory and then:
+On Windows, once you have gotten the dependencies and the source, `cd pyside2-setup.git` to enter the directory and then:
```
python setup.py install --qmake=\path\to\bin\qmake --cmake=\path\to\bin\cmake --openssl=\path\to\openssl\bin
```
diff --git a/sources/pyside2 b/sources/pyside2
-Subproject 2c2223a1da3994448cb714e415cd4be4f94698c
+Subproject 35348484553ca9f3d8e6efb049b936b946e5141
diff --git a/sources/shiboken2 b/sources/shiboken2
-Subproject 2e0d807d4ee668d15c570be113be3487063c1c5
+Subproject 98058d4104e6166adba10ba9f84f499afe6b3e4