From 37cfea29101361e57c185923e2de7ce0ab3ab74e Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Wed, 21 Mar 2012 11:16:09 +0100 Subject: Disable the use of sed on native mingw Partially reverts 28f294e1e98f2437ce0d9614e698df7c8dc52dc6 Commit 28f294e1e98f2437ce0d9614e698df7c8dc52dc6 introduced the use of 'sed' to do replacements for mingw in pkgconfig files, similar to what is done for unix. However, this causes corrupted pkgconfig files when 'sed' is not available. While on Unix we can safely assume that 'sed' is always available, it appears that when building on Windows with mingw 'sed' might not be available. As it would be too complicated for the 4.8 branch to add support for automatic 'sed' detection, this patch chooses to completely disable the use of 'sed' for all mingw builds on Windows. For cross compiled builds 'sed' is still used. Change-Id: I8b6b3f52df6906cd087dd3eb417bdb5800e8eafc Reviewed-by: Andy Shaw Reviewed-by: Oswald Buddenhagen --- mkspecs/win32-g++/qmake.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 5aa8a2d7ce..220af32c54 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -79,7 +79,6 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain QMAKE_DIR_SEP = / QMAKE_QMAKE ~= s,\\\\,/, QMAKE_COPY = cp - QMAKE_STREAM_EDITOR = sed QMAKE_COPY_DIR = cp -r QMAKE_MOVE = mv QMAKE_DEL_FILE = rm -- cgit v1.2.1