diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-09-09 12:28:54 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-09-09 11:42:13 +0000 |
| commit | f590b159c56d9112ae8f6f2aeb960a365a881ac5 (patch) | |
| tree | a5d6ba95c223814b44c7138d7bbb46cc76481e14 /src/core | |
| parent | dc16cdd60449112343d43852960142db7fd155fd (diff) | |
do not generate qmake_extras.gypi in the source directory
Among other things, we store the used compiler in there. This
information belongs into the build directory. Otherwise switching
toolchains becomes challenging.
Task-number: QTBUG-43014
Change-Id: I9bec26a235f5251322792632d4667cc71210286d
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/gyp_configure_host.pro | 2 | ||||
| -rw-r--r-- | src/core/gyp_configure_target.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro index 3eb67389f..eb94cb802 100644 --- a/src/core/gyp_configure_host.pro +++ b/src/core/gyp_configure_host.pro @@ -10,7 +10,7 @@ GYPI_CONTENTS = "{" \ " ['CXX.host', '$$which($$QMAKE_CXX)']," \ " ['LD.host', '$$which($$QMAKE_LINK)']," -GYPI_FILE = $$absolute_path('qmake_extras.gypi') +GYPI_FILE = $$OUT_PWD/qmake_extras.gypi !build_pass { write_file($$GYPI_FILE, GYPI_CONTENTS) } diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro index 4d5204407..2a5996636 100644 --- a/src/core/gyp_configure_target.pro +++ b/src/core/gyp_configure_target.pro @@ -26,7 +26,7 @@ GYPI_CONTENTS += " ]," \ GYPI_CONTENTS += "}" -GYPI_FILE = $$absolute_path('qmake_extras.gypi') +GYPI_FILE = $$OUT_PWD/qmake_extras.gypi !exists($$GYPI_FILE): error("-- $$GYPI_FILE not found --") |