whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move QT_CPU_FEATURES from qconfig.pri to qmodule.pri 

QT_CPU_FEATURES is internal and only used by simd.prf, which is
also internal. This matches the available CPU features which are
detected using config tests and written to CONFIG in qmodule.pri.

Change-Id: I8eb35448e2954a54c228d3617f29afc0283a7db5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
bb10
Tor Arne Vestbø 2013-04-10 12:57:06 +02:00 committed by The Qt Project
parent b7891514ab
commit a12a67c820
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -6413,10 +6413,8 @@ cat >>"$QTCONFIG.tmp" <<EOF
CONFIG += $QTCONFIG_CONFIG
host_build {
QT_ARCH = $CFG_HOST_ARCH
QT_CPU_FEATURES = $CFG_HOST_CPUFEATURES
} else {
QT_ARCH = $CFG_ARCH
QT_CPU_FEATURES = $CFG_CPUFEATURES
QMAKE_DEFAULT_LIBDIRS = `echo "$DEFAULT_LIBDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '`
QMAKE_DEFAULT_INCDIRS = `echo "$DEFAULT_INCDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '`
}
@ -6501,6 +6499,14 @@ if [ -n "$CFG_SKIP_MODULES" ]; then
echo "QT_SKIP_MODULES += $CFG_SKIP_MODULES" >> "$QTMODULE.tmp"
fi
cat >>"$QTMODULE.tmp" <<EOF
host_build {
QT_CPU_FEATURES = $CFG_HOST_CPUFEATURES
} else {
QT_CPU_FEATURES = $CFG_CPUFEATURES
}
EOF
if [ -n "$QT_CFLAGS_PSQL" ]; then
echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" >> "$QTMODULE.tmp"
fi

8
tools/configure/configureapp.cpp
View File

@ -2871,6 +2871,12 @@ void Configure::generateCachefile()
moduleStream << "QT_SKIP_MODULES += " << skipModules.join(' ') << endl;
moduleStream << endl;
moduleStream << "host_build {" << endl;
moduleStream << " QT_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
moduleStream << "} else {" << endl;
moduleStream << " QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl;
moduleStream << "}" << endl;
if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE")
moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl;
@ -3151,10 +3157,8 @@ void Configure::generateQConfigPri()
configStream << 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;
if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
// FIXME: add detection
configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;