diff options
Diffstat (limited to 'tools/qmake/mkspecs/features/gyp_generator.prf')
| -rw-r--r-- | tools/qmake/mkspecs/features/gyp_generator.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index d15b864c9..ad87f5673 100644 --- a/tools/qmake/mkspecs/features/gyp_generator.prf +++ b/tools/qmake/mkspecs/features/gyp_generator.prf @@ -55,7 +55,7 @@ defineReplace(rccAction) { return($$contents) } -GYPI_FILE = $$replace(_PRO_FILE_, .pro$, .gyp) +isEmpty(GYPFILE): GYPFILE = $$replace(_PRO_FILE_, .pro$, .gyp) TARGET_TYPE = $$toGypTargetType() MOCABLE_HEADERS = $$findMocables($$HEADERS) @@ -196,10 +196,10 @@ GYP_CONTENTS += " ]," \ GYP_CONTENTS += " ]," \ "}" -!build_pass: write_file($$GYPI_FILE, GYP_CONTENTS) +!build_pass: write_file($$GYPFILE, GYP_CONTENTS) # Overwriting the generated gyp file seems like a good reason to re-gyp -unix: phony_variable_name_for_qmake_to_be_happy=$$system("touch $$QTWEBENGINE_ROOT/build/build.pro") +unix: phony_variable_name_for_qmake_to_be_happy=$$system("touch $$QTWEBENGINE_ROOT/src/core/gyp_run.pro") # The generated Makefile shouldn't build anything by itself, just re-run qmake if necessary TEMPLATE = aux |