diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-25 16:03:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-10 14:16:36 +0200 |
| commit | 83f473b2cdd674803615e7a8a8ab01ca0aa579ee (patch) | |
| tree | 9aae83fb724fe302a29271fc78c3917d4be1d4b0 /tools/configure | |
| parent | 537a4bc4011d32de193dc31caf09a44c1810ab33 (diff) | |
Don't use custom namespace for QT_HOST_ARCH/CPUFEATURES
We now have host_build to distinguish the two, and we load
qconfig.pri from both the host and the target mkspec, with
host_build set correctly.
Change-Id: I8b8b80d5487d10bb1d4585d27d10300f609a7775
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a1ad081d97..9a8aaa5d28 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3142,10 +3142,13 @@ void Configure::generateQConfigPri() configStream << " qpa"; configStream << endl; - configStream << "QT_ARCH = " << dictionary["QT_ARCH"] << endl; - configStream << "QT_HOST_ARCH = " << dictionary["QT_HOST_ARCH"] << endl; - configStream << "QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl; - configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; + configStream << "host_build {" << endl; + configStream << " QT_ARCH = " << dictionary["QT_HOST_ARCH"] << endl; + configStream << " QT_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; + configStream << "} else {" << endl; + configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; + configStream << " QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl; + configStream << "}" << endl; if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { // FIXME: add detection configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; |