AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

export QMAKESPEC to the project

Browse Source 
this makes it unnecessary to dump qmakespec to .qmake.cache and
qmodule.pri.

Task-number: QTBUG-22700
Change-Id: I678c7ee7df2512184b9cd06d7a3be8bbd0b0da15
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-01-30 20:14:29 +01:00 committed by Qt by Nokia
parent 0002464b46
commit 43663bc87d
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -5914,18 +5914,6 @@ CONFIG += dylib depend_includepath fix_output_dirs no_private_qt_headers_warning
EOF
#dump the qmake spec
if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then
echo "XQMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp"
else
echo "XQMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp"
fi
if [ -d "$outpath/mkspecs/$PLATFORM" ]; then
echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$PLATFORM" >> "$CACHEFILE.tmp"
else
echo "QMAKESPEC = $PLATFORM" >> "$CACHEFILE.tmp"
fi
# replace .qmake.cache if it differs from the newly created temp file
if cmp -s "$CACHEFILE.tmp" "$CACHEFILE"; then
rm -f "$CACHEFILE.tmp"

1
qmake/project.cpp
View File

@ -1491,6 +1491,7 @@ QMakeProject::read(uchar cmd)
QString orig_spec = first(QLatin1String("QMAKESPEC_ORIGINAL"));
real_spec = orig_spec.isEmpty() ? qmakespec : orig_spec;
#endif
vars["QMAKESPEC"] << real_spec;
short_spec = QFileInfo(real_spec).fileName();
doProjectInclude("spec_post", IncludeFlagFeature, vars);
// The spec extends the feature search path, so invalidate the cache.

13
tools/configure/configureapp.cpp
View File

@ -2674,19 +2674,6 @@ void Configure::generateCachefile()
moduleStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl;
moduleStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl << endl;
QString hostSpec = dictionary[ "QMAKESPEC" ];
QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : hostSpec;
QString xmkspec_path = sourcePath + "/mkspecs/" + targetSpec;
if (QFile::exists(xmkspec_path))
moduleStream << "XQMAKESPEC = " << xmkspec_path << endl;
else
moduleStream << "XQMAKESPEC = " << targetSpec << endl;
QString mkspec_path = sourcePath + "/mkspecs/" + hostSpec;
if (QFile::exists(mkspec_path))
moduleStream << "QMAKESPEC = " << mkspec_path << endl;
else
moduleStream << "QMAKESPEC = " << hostSpec << endl;
if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE")
moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl;