summaryrefslogtreecommitdiff
path: root/scripts/setenv-unibuild.sh
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2013-02-03 01:40:26 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2013-02-03 01:40:26 (GMT)
commit44cddd0b3cf69b1e10811f0000c0ddef02c15d58 (patch)
tree536dc65cf43152e3934ac123086afa9d9d648483 /scripts/setenv-unibuild.sh
parentb390d54471201731db1158fa21aa54fcef1f7582 (diff)
parente5448f5e69f6d59256ba1816acf2647e808e10db (diff)
Merge branch 'master' of github.com:openscad/openscad into cmake_workaround
Conflicts: tests/virtualfb.sh
Diffstat (limited to 'scripts/setenv-unibuild.sh')
-rw-r--r--scripts/setenv-unibuild.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/setenv-unibuild.sh b/scripts/setenv-unibuild.sh
index 881526e..66fb7a9 100644
--- a/scripts/setenv-unibuild.sh
+++ b/scripts/setenv-unibuild.sh
@@ -130,5 +130,12 @@ if [ "`echo $* | grep qt5`" ]; then
setenv_qt5
fi
+if [ -e $DEPLOYDIR/include/Qt ]; then
+ echo "Qt found under $DEPLOYDIR ... "
+ QTDIR=$DEPLOYDIR
+ export QTDIR
+ echo "QTDIR modified to $DEPLOYDIR"
+fi
+
clean_note
contact: Jan Huwald // Impressum