diff options
| author | Hib Eris <hib@hiberis.nl> | 2012-03-21 11:16:09 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-21 15:24:36 +0100 |
| commit | 37cfea29101361e57c185923e2de7ce0ab3ab74e (patch) | |
| tree | a082079f587bc1585562126997dd812b141b06c9 | |
| parent | ade8eb52e9009d6f4d720b81e30ee9b4bca18a3f (diff) | |
| download | qt4-tools-37cfea29101361e57c185923e2de7ce0ab3ab74e.tar.gz | |
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 <andy.shaw@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
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 |