diff options
| -rw-r--r-- | cad/klayout/files/patch-build.sh | 4 | ||||
| -rw-r--r-- | cad/klayout/files/patch-src-Makefile.main | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cad/klayout/files/patch-build.sh b/cad/klayout/files/patch-build.sh index 20f99fc9134d..2365cad9e66c 100644 --- a/cad/klayout/files/patch-build.sh +++ b/cad/klayout/files/patch-build.sh @@ -5,13 +5,13 @@ fi -if [ ! -r $QTDIR/bin/moc ]; then -+if [ ! -r $QTDIR/bin/moc4 ]; then ++if [ ! -r $QTDIR/bin/moc-qt4 ]; then echo "*** ERROR: unable to locate Qt MOC in $QTDIR/bin" exit 1 fi -if [ ! -r $QTDIR/bin/uic ]; then -+if [ ! -r $QTDIR/bin/uic4 ]; then ++if [ ! -r $QTDIR/bin/uic-qt4 ]; then echo "*** ERROR: unable to locate Qt UIC in $QTDIR/bin" exit 1 fi diff --git a/cad/klayout/files/patch-src-Makefile.main b/cad/klayout/files/patch-src-Makefile.main index 45087d421e6d..395dbc29264c 100644 --- a/cad/klayout/files/patch-src-Makefile.main +++ b/cad/klayout/files/patch-src-Makefile.main @@ -6,8 +6,8 @@ -MOC=$(QTDIR)/bin/moc -UIC=$(QTDIR)/bin/uic -+MOC=$(QTDIR)/bin/moc4 -+UIC=$(QTDIR)/bin/uic4 ++MOC=$(QTDIR)/bin/moc-qt4 ++UIC=$(QTDIR)/bin/uic-qt4 RCC=$(QTDIR)/bin/rcc INCFLAGS=\ |