summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@intopalo.com>2015-08-02 13:53:27 +0300
committerAndrew Knight <andrew.knight@intopalo.com>2015-08-13 10:24:51 +0000
commitd9cfca67e17d5bd0f818ec5e55635571f58b4ea1 (patch)
treec56cc030954ded0ba6675e702341d0fcdf1ec870
parent0fb890062142f95432daaa58d4e093c9dcf18044 (diff)
call flex by its standard name
qt5.git now contains the win_flex as simply flex. Change-Id: I3c3f8c204908f81bd88ee58323cf982f08d2d525 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r--Tools/qmake/mkspecs/features/default_pre.prf3
1 files changed, 0 insertions, 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