diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
| commit | 52dfffd97ba49b603b4814d843cd9be08d040364 (patch) | |
| tree | 044c93d19aa38ac24822a241babbece7425bfbb2 /flex.pri | |
| parent | 0be212e75d73644b1cff8291a4b6a6fe0098b942 (diff) | |
| parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'flex.pri')
| -rw-r--r-- | flex.pri | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -13,6 +13,10 @@ unix:freebsd-g++ { QMAKE_LEX = /usr/local/bin/flex } +unix:netbsd* { + QMAKE_LEX = /usr/pkg/bin/flex +} + unix:linux* { exists(/usr/bin/flex) { QMAKE_LEX = /usr/bin/flex |