diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-18 14:23:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-28 16:16:28 +0100 |
| commit | 1c5e30928bd3ec31747276ff60940ec144a2cc16 (patch) | |
| tree | 7ccc07f0687bae9b2fd6b6eb494d8e3b8663690b /tools/qmake/mkspecs/features/gyp_generator.prf | |
| parent | fd61d752e313bf91a09c85020b3fb50067c610c8 (diff) | |
Moving sources to src part 2: Adjust paths.
NOTE: To build after this you should rerun init-repository.py or run
$> git submodule sync
$> git submodule update
$> git config qtwebengine.chromiumsrcdir src/3rdparty
This makes everything build by adjusting paths.
Other mixed-in changes:
- Rename qtwebengine_src variables in scripts to qtwebengine_root to
avoid confusion.
- Cleanup the release and debug extra targets that were in lib.pro.
This file has also been split into src.pro and core.pro.
Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
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 |