Make configure.exe not overwrite its own Makefile in -fast mode
authorThiago Macieira <thiago.macieira@intel.com>
Tue, 24 Apr 2012 17:15:49 +0000 (19:15 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 25 Apr 2012 10:43:25 +0000 (12:43 +0200)
configure.exe's Makefile is created by configure.bat. While severely
lacking, it is what gets executed when the user configures, so
developers modifying configure.exe should use that too.

Change-Id: Ib216889594d08c980bfae6d2dbbb27ee9901375a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
tools/configure/configureapp.cpp

index 7151f3e..1d202c0 100644 (file)
@@ -3401,6 +3401,9 @@ void Configure::generateMakefiles()
             for (i=0; i<3; i++) {
                 for (int j=0; j<makeList[i].size(); ++j) {
                     MakeItem *it=makeList[i][j];
+                    if (it->directory == "tools/configure")
+                        continue; // don't overwrite our own Makefile
+
                     QString dirPath = fixSeparators(it->directory + "/");
                     QString projectName = it->proFile;
                     QString makefileName = buildPath + "/" + dirPath + it->target;