diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-03 16:19:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 16:48:33 +0200 |
| commit | 493b4311ff3995118ac5c15f49803447c8fba854 (patch) | |
| tree | efa960d3cd001955e97ed90ab437b3014e221e13 | |
| parent | f4dd0828dcc39946835dad6ce416a65d911e2cd5 (diff) | |
don't match on the spec name in qconfig.pri
this will fail now even on unix (and wouldn't have ever worked on
windows), as the full spec name is known only after reading the spec,
and qconfig.pri is read from inside the spec.
matching on the host_build flag is cleaner anyway.
Change-Id: I7da144e89ab3db0fad942d755d8cb0a0f3b85588
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Donald Carr <sirspudd@gmail.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -5806,7 +5806,7 @@ fi if [ -n "$CFG_SYSROOT" ]; then echo "# sysroot" >>"$QTCONFIG.tmp" - echo `basename "$XQMAKESPEC"` \{ >>"$QTCONFIG.tmp" + echo "!host_build {" >>"$QTCONFIG.tmp" echo " QMAKE_CFLAGS += --sysroot=\$\$[QT_SYSROOT]" >>"$QTCONFIG.tmp" echo " QMAKE_CXXFLAGS += --sysroot=\$\$[QT_SYSROOT]" >>"$QTCONFIG.tmp" echo " QMAKE_LFLAGS += --sysroot=\$\$[QT_SYSROOT]" >>"$QTCONFIG.tmp" diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 38171f5eb4..a192f8aa75 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2940,10 +2940,9 @@ void Configure::generateQConfigPri() << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; if (!dictionary["CFG_SYSROOT"].isEmpty()) { - QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : dictionary[ "QMAKESPEC" ]; configStream << endl << "# sysroot" << endl - << targetSpec << " {" << endl + << "!host_build {" << endl << " QMAKE_CFLAGS += --sysroot=$$[QT_SYSROOT]" << endl << " QMAKE_CXXFLAGS += --sysroot=$$[QT_SYSROOT]" << endl << " QMAKE_LFLAGS += --sysroot=$$[QT_SYSROOT]" << endl |