diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-04-24 19:15:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-25 12:43:25 +0200 |
| commit | f1b324a83cbaf6d9bde1e72e50f7efca4c4d0bb1 (patch) | |
| tree | 96af6dff045e1f15f6df43d2950453c23bdb1e23 /tools/configure/configureapp.cpp | |
| parent | 8da57f37320478e1ae6094410ff230aa4580689b (diff) | |
Make configure.exe not overwrite its own Makefile in -fast mode
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>
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7151f3e119..1d202c0e44 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -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; |