diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-07-27 15:39:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-28 00:09:45 +0200 |
commit | d9048bef20103ac0c1af3365c8a47f1569a8e529 (patch) | |
tree | c6c0287312a0ea4c651c6ac5aa4b73ef20d8c0b0 /tools/configure | |
parent | 2f587ee689f7d29f08090022c171d59a66c1d730 (diff) |
Make 'nmake qmake' work with the stub (fast) Makefiles
Without this, if you ran 'nmake qmake' or 'jom qmake' in qtbase's
top directory, it would simply tell you that 'qmake' was up to date.
After all, there is a directory called 'qmake' there.
Change-Id: I6cdb405e8106c137ecbab27923e524b924b19c84
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'tools/configure')
-rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 1727b30d17..17864046c9 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3810,8 +3810,9 @@ void Configure::generateMakefiles() txt << "\t" << args.join(" ") << "\n"; txt << "\t$(MAKE) -$(MAKEFLAGS) -f " << it->target << "\n"; txt << "first: all\n"; - txt << "qmake:\n"; + txt << "qmake: FORCE\n"; txt << "\t" << args.join(" ") << "\n"; + txt << "FORCE:\n"; } } } |