Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	src/lexer.l
	tests/CMakeLists.txt

1 files changed, 4 insertions, 0 deletions

diff --git a/flex.pri b/flex.pri
index 2e1559e..57f854e 100644
--- a/flex.pri
+++ b/flex.pri
@@ -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