From d9cfca67e17d5bd0f818ec5e55635571f58b4ea1 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Sun, 2 Aug 2015 13:53:27 +0300 Subject: call flex by its standard name qt5.git now contains the win_flex as simply flex. Change-Id: I3c3f8c204908f81bd88ee58323cf982f08d2d525 Reviewed-by: Joerg Bornemann --- Tools/qmake/mkspecs/features/default_pre.prf | 3 --- 1 file changed, 3 deletions(-) diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index ce97df429..2397c54aa 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -106,10 +106,7 @@ if(win32|mac):!macx-xcode { contains(QT_CONFIG, build_all): CONFIG += build_all } -# A newer version of flex is required on Windows. At the moment the only -# one that appears to provide binaries and is not cygwin is winflex. FLEX = flex -equals(QMAKE_HOST.os, Windows): FLEX = win_flex BIN_EXTENSION = win32: BIN_EXTENSION = .exe -- cgit v1.2.3