[mingw-qt: 31/65] Added a workaround for a bug in qmake 4.7.0.beta1

epienbro epienbro at fedoraproject.org
Tue Mar 6 21:29:21 UTC 2012


commit a2903d4b97a2fec62119adaa195c9840f29c341f
Author: epienbro <epienbro at fedoraproject.org>
Date:   Sun Jun 27 15:06:21 2010 +0000

    Added a workaround for a bug in qmake 4.7.0.beta1

 mingw32-qt.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 0531e96..2b39817 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -124,6 +124,11 @@ for d in %{?subdirs} %{?relsubdirs} %{?dbgsubdirs}; do
 #  since we trash the PCH cache, everything is rebuilt again at install time,
 #  so there's no point in building now
 #  make %{?_smp_mflags}
+
+# Qt 4.7.0.beta1 contains a bug where invalid slashes are used in a Makefile
+# when the .pro files contains 'TEMPLATE = subdirs'. Work around this
+  sed -i s/"\\\\usr\\\\bin\\\\qmake-qt4"/"\/usr\/bin\/qmake-qt4"/ Makefile
+
   popd
 
   # As above ...


More information about the scm-commits mailing list