Make 'nmake qmake' work with the stub (fast) Makefiles
authorThiago Macieira <thiago.macieira@intel.com>
Fri, 27 Jul 2012 13:39:49 +0000 (15:39 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 27 Jul 2012 22:09:45 +0000 (00:09 +0200)
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>
tools/configure/configureapp.cpp

index 1727b30..1786404 100644 (file)
@@ -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";
                 }
             }
         }