diff options
| author | David Schulz <david.schulz@theqtcompany.com> | 2015-10-12 09:55:30 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2015-10-30 13:14:51 +0000 |
| commit | c23a086e4fc9d7d7b2420de26cbc5adcbd23596e (patch) | |
| tree | 8251c0edd80825742a04d3292ecc9a175122b899 /qtbase.pro | |
| parent | a2b58c1643b5c8b67cb18750ef2d565180a3a179 (diff) | |
configure: Separate host and build platform.
This separation makes it possible to make a
canadian cross build of Qt on a linux build machine.
The canadian cross build requires an external Qt that
runs on the build system.
Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/qtbase.pro b/qtbase.pro index 24d0f5287b..5b709864c7 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -4,7 +4,7 @@ load(qt_parts) -SUBDIRS += qmake/qmake-docs.pro +SUBDIRS += qmake/qmake-aux.pro cross_compile: CONFIG += nostrip @@ -37,15 +37,6 @@ CONFIG -= qt ### installations #### -#qmake -qmake.path = $$[QT_HOST_BINS] -equals(QMAKE_HOST.os, Windows) { - qmake.files = $$OUT_PWD/bin/qmake.exe -} else { - qmake.files = $$OUT_PWD/bin/qmake -} -INSTALLS += qmake - #licheck licheck.path = $$[QT_HOST_BINS] licheck.files = $$PWD/bin/$$QT_LICHECK |