diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-07 18:45:03 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-07 18:45:03 -0300 |
| commit | 7c3ff09938c382a482c5b3049bee6c1c5c5f04a3 (patch) | |
| tree | 0b9087e9b5ba103d3679f68bfb361e185cc39bd5 | |
| parent | 2d76c3c97d03d937f238f4ccab633f8db6b77ba7 (diff) | |
| parent | 9b48a6286cd421caf1cca98709aa4811753b77c9 (diff) | |
Merge remote-tracking branch 'ivan/feature/3411_add-pyside-uic-inside-venv' into develop
| -rw-r--r-- | changes/feature_add-uic-support-in-virtualenv | 1 | ||||
| -rwxr-xr-x | pkg/postmkvenv.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changes/feature_add-uic-support-in-virtualenv b/changes/feature_add-uic-support-in-virtualenv new file mode 100644 index 00000000..2c067f80 --- /dev/null +++ b/changes/feature_add-uic-support-in-virtualenv @@ -0,0 +1 @@ + o Add pyside-uic support inside the virtualenv. This way it won't fail to 'make' if the virtualenv is activated. Closes #3411. diff --git a/pkg/postmkvenv.sh b/pkg/postmkvenv.sh index 2f0cba45..04f8d372 100755 --- a/pkg/postmkvenv.sh +++ b/pkg/postmkvenv.sh @@ -16,7 +16,7 @@ elif [[ "$unamestr" == 'Darwin' ]]; then platform='darwin' fi -LIBS=( PySide ) +LIBS=( PySide pysideuic ) PYTHON_VERSION=python$(python -c "import sys; print (str(sys.version_info[0])+'.'+str(sys.version_info[1]))") VAR=( $(which -a $PYTHON_VERSION) ) |