diff options
| author | Donald Carr <donald.carr@nokia.com> | 2009-10-27 17:25:58 +0000 |
|---|---|---|
| committer | Donald Carr <donald.carr@nokia.com> | 2009-10-27 17:36:57 +0000 |
| commit | 27d5b8764980cbccab29cb86e10751a4e5937d01 (patch) | |
| tree | b56ef2ff666b7c67e1f4044db8efb663f29082d5 /configure | |
| parent | ea139224d49a543cbd09fff450df101720095307 (diff) | |
Guard shadow builds against stale qconfig.cpp
qconfig.cpp is generated immediately after accepting the licensing
agreement, and contains all the fixed paths qt uses. If this file is
present in a source dir used by shadow builds, this qconfig.cpp will take
precedence over the shadow builds qconfig.cpp and hence impose its paths
throughout the shadow built Qt.
This change adds qconfig.cpp to the list of generated files to guard
against existing in the source directory when performing a shadow build.
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2140,7 +2140,7 @@ if [ "$OPT_SHADOW" = "maybe" ]; then fi fi if [ "$OPT_SHADOW" = "yes" ]; then - if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" ]; then + if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" -o -f "$relpath/src/corelib/global/qconfig.cpp" ]; then echo >&2 "You cannot make a shadow build from a source tree containing a previous build." echo >&2 "Cannot proceed." exit 1 |