Permalink
Browse files

Fixed warning when -unix, -macx or -win32 is passed to qmake.

The parsing of these options was missed because they are deprecated, but
they seem to be used by default by some older versions of qmake.
  • Loading branch information...
Rohan McGovern
Rohan McGovern committed May 14, 2012
1 parent 8099dc7 commit 3060813de5a5698cb11733bead0c4fe296903e75
Showing with 8 additions and 1 deletion.
  1. +3 −0 lib/QMake/Project.pm
  2. +5 −1 t/01-QMake-Project.t
View
@@ -274,6 +274,9 @@ sub _parse_qmake_command
nodepend
nomoc
nopwd
+ macx
+ unix
+ win32
)),
map( { $_ => $sub_accept_option_with_value } qw(
unset=s
View
@@ -195,7 +195,11 @@ sub test_error
my $dir = "$TESTDATA/04-error";
local $CWD = $dir;
- run_qmake( );
+ my $qmake_args = q{};
+ if ($OSNAME =~ m{linux}i) {
+ $qmake_args = '-unix';
+ }
+ run_qmake( $qmake_args );
# qmake worked the first time, but this environment
# variable will force an error when we try to parse it.

0 comments on commit 3060813

Please sign in to comment.