1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't match on the spec name in qconfig.pri

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-07-03 16:19:28 +02:00 committed by Qt by Nokia
parent f4dd0828dc
commit 493b4311ff
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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"

3
tools/configure/configureapp.cpp
View File

@ -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