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

introduce /get property variants

Browse Source 
properties are now split into a write location $$[FOO] and a read
location $$[FOO/get]. the write locations are hard-coded and configurable
via qt.conf/Paths as before, while the read locations are configured via
qt.conf/EffectivePaths.

this finally provides a clean solution to the problem that during the qt
build itself tools and libraries need to be taken from somewhere else
than they are installed to.

Change-Id: I956c43bd082afd465e690fe75d0bee3c2c0f7c25
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
This commit is contained in:
Oswald Buddenhagen 2012-05-03 15:36:03 +02:00
parent ab0d55e361
commit 6a8f64136e
7 changed files with 89 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -3597,6 +3597,16 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
[ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
fi # Build qmake
#-------------------------------------------------------------------------------
# create a qt.conf for the Qt build tree itself
#-------------------------------------------------------------------------------
QTCONFFILE="$outpath/bin/qt.conf"
cat > "$QTCONFFILE" <<EOF
[EffectivePaths]
Prefix=..
EOF
#-------------------------------------------------------------------------------
# Detect pkg-config
#-------------------------------------------------------------------------------

2
qmake/generators/makefile.cpp
View File

@ -3143,7 +3143,7 @@ MakefileGenerator::pkgConfigPrefix() const
{
if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX"))
return project->first("QMAKE_PKGCONFIG_PREFIX");
return QLibraryInfo::rawLocation(QLibraryInfo::PrefixPath);
return QLibraryInfo::rawLocation(QLibraryInfo::PrefixPath, QLibraryInfo::FinalPaths);
}
QString

8
qmake/project.cpp
View File

@ -632,7 +632,8 @@ QStringList qmake_feature_paths(QMakeProperty *prop, bool host_build)
}
for(QStringList::Iterator concat_it = concat.begin();
concat_it != concat.end(); ++concat_it)
feature_roots << (QLibraryInfo::location(QLibraryInfo::HostDataPath) +
feature_roots << (QLibraryInfo::rawLocation(QLibraryInfo::HostDataPath,
QLibraryInfo::EffectivePaths) +
mkspecs_concat + (*concat_it));
feature_roots.removeDuplicates();
return feature_roots;
@ -652,7 +653,7 @@ QStringList qmake_mkspec_paths()
ret << project_build_root + concat;
if (!project_root.isEmpty())
ret << project_root + concat;
ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat;
ret << QLibraryInfo::rawLocation(QLibraryInfo::HostDataPath, QLibraryInfo::EffectivePaths) + concat;
ret.removeDuplicates();
return ret;
@ -3802,7 +3803,8 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis
place[var] = QStringList(Option::fixPathToTargetOS(
!Option::qmake_abslocation.isEmpty()
? Option::qmake_abslocation
: QLibraryInfo::location(QLibraryInfo::HostBinariesPath) + "/qmake",
: QLibraryInfo::rawLocation(QLibraryInfo::HostBinariesPath,
QLibraryInfo::EffectivePaths) + "/qmake",
false));
}
#if defined(Q_OS_WIN32) && defined(Q_CC_MSVC)

6
qmake/property.cpp
View File

@ -79,7 +79,8 @@ QMakeProperty::QMakeProperty() : settings(0)
{
for (int i = 0; i < sizeof(propList)/sizeof(propList[0]); i++) {
QString name = QString::fromLatin1(propList[i].name);
QString val = QLibraryInfo::rawLocation(propList[i].loc);
m_values[name + "/get"] = QLibraryInfo::rawLocation(propList[i].loc, QLibraryInfo::EffectivePaths);
QString val = QLibraryInfo::rawLocation(propList[i].loc, QLibraryInfo::FinalPaths);
if (!propList[i].raw) {
m_values[name] = QLibraryInfo::location(propList[i].loc);
name += "/raw";
@ -214,9 +215,12 @@ QMakeProperty::exec()
foreach (QString prop, specialProps) {
QString val = value(prop);
QString pval = value(prop + "/raw");
QString gval = value(prop + "/get");
fprintf(stdout, "%s:%s\n", prop.toLatin1().constData(), val.toLatin1().constData());
if (!pval.isEmpty() && pval != val)
fprintf(stdout, "%s/raw:%s\n", prop.toLatin1().constData(), pval.toLatin1().constData());
if (!gval.isEmpty() && gval != (pval.isEmpty() ? val : pval))
fprintf(stdout, "%s/get:%s\n", prop.toLatin1().constData(), gval.toLatin1().constData());
}
return true;
}

63
src/corelib/global/qlibraryinfo.cpp
View File

@ -70,6 +70,10 @@ struct QLibrarySettings
{
QLibrarySettings();
QScopedPointer<QSettings> settings;
#ifdef QT_BUILD_QMAKE
bool haveEffectivePaths;
bool havePaths;
#endif
};
Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings)
@ -77,12 +81,21 @@ class QLibraryInfoPrivate
{
public:
static QSettings *findConfiguration();
#ifndef QT_BUILD_QMAKE
static void cleanup()
{
QLibrarySettings *ls = qt_library_settings();
if (ls)
ls->settings.reset(0);
}
#else
static bool haveGroup(QLibraryInfo::PathGroup group)
{
QLibrarySettings *ls = qt_library_settings();
return ls ? (group == QLibraryInfo::EffectivePaths
? ls->haveEffectivePaths : ls->havePaths) : false;
}
#endif
static QSettings *configuration()
{
QLibrarySettings *ls = qt_library_settings();
@ -95,7 +108,25 @@ QLibrarySettings::QLibrarySettings()
{
#ifndef QT_BUILD_QMAKE
qAddPostRoutine(QLibraryInfoPrivate::cleanup);
bool haveEffectivePaths;
bool havePaths;
#endif
if (settings) {
// This code needs to be in the regular library, as otherwise a qt.conf that
// works for qmake would break things for dynamically built Qt tools.
QStringList children = settings->childGroups();
haveEffectivePaths = children.contains(QLatin1String("EffectivePaths"));
// Backwards compat: an existing but empty file is claimed to contain the Paths section.
havePaths = !haveEffectivePaths || children.contains(QLatin1String("Paths"));
#ifndef QT_BUILD_QMAKE
if (!havePaths)
settings.reset(0);
#else
} else {
haveEffectivePaths = false;
havePaths = false;
#endif
}
}
QSettings *QLibraryInfoPrivate::findConfiguration()
@ -244,11 +275,11 @@ QString
QLibraryInfo::location(LibraryLocation loc)
{
#ifdef QT_BUILD_QMAKE
QString ret = rawLocation(loc);
QString ret = rawLocation(loc, FinalPaths);
// Automatically prepend the sysroot to target paths
if (loc < SysrootPath || loc > LastHostPath) {
QString sysroot = rawLocation(SysrootPath);
QString sysroot = rawLocation(SysrootPath, FinalPaths);
if (!sysroot.isEmpty() && ret.length() > 2 && ret.at(1) == QLatin1Char(':')
&& (ret.at(2) == QLatin1Char('/') || ret.at(2) == QLatin1Char('\\')))
ret.replace(0, 2, sysroot); // Strip out the drive on Windows targets
@ -260,13 +291,25 @@ QLibraryInfo::location(LibraryLocation loc)
}
QString
QLibraryInfo::rawLocation(LibraryLocation loc)
QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
{
#else
# define rawLocation location
# define rawLocation(loca, group) location(loca)
# define group dummy
#endif
QString ret;
if(!QLibraryInfoPrivate::configuration()) {
#ifdef QT_BUILD_QMAKE
// Logic for choosing the right data source: if EffectivePaths are requested
// and qt.conf with that section is present, use it, otherwise fall back to
// FinalPaths. For FinalPaths, use qt.conf if present and contains not only
// [EffectivePaths], otherwise fall back to builtins.
if (!QLibraryInfoPrivate::haveGroup(group)
&& (group == FinalPaths
|| !(group = FinalPaths, QLibraryInfoPrivate::haveGroup(FinalPaths))))
#else
if (!QLibraryInfoPrivate::configuration())
#endif
{
const char *path = 0;
if (loc >= 0 && loc < sizeof(qt_configure_prefix_path_strs)/sizeof(qt_configure_prefix_path_strs[0]))
path = qt_configure_prefix_path_strs[loc] + 12;
@ -291,7 +334,11 @@ QLibraryInfo::rawLocation(LibraryLocation loc)
if(!key.isNull()) {
QSettings *config = QLibraryInfoPrivate::configuration();
config->beginGroup(QLatin1String("Paths"));
config->beginGroup(QLatin1String(
#ifdef QT_BUILD_QMAKE
group == EffectivePaths ? "EffectivePaths" :
#endif
"Paths"));
ret = config->value(key, defaultValue).toString();
@ -327,7 +374,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc)
baseDir = QFileInfo(qmake_libraryInfoFile()).absolutePath();
} else if (loc > SysrootPath && loc <= LastHostPath) {
// We make any other host path absolute to the host prefix directory.
baseDir = rawLocation(HostPrefixPath);
baseDir = rawLocation(HostPrefixPath, group);
#else
if (loc == PrefixPath) {
if (QCoreApplication::instance()) {
@ -349,7 +396,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc)
#endif
} else {
// we make any other path absolute to the prefix directory
baseDir = rawLocation(PrefixPath);
baseDir = rawLocation(PrefixPath, group);
}
ret = QDir::cleanPath(baseDir + QLatin1Char('/') + ret);
}

3
src/corelib/global/qlibraryinfo.h
View File

@ -90,7 +90,8 @@ public:
};
static QString location(LibraryLocation); // ### Qt 6: consider renaming it to path()
#ifdef QT_BUILD_QMAKE
static QString rawLocation(LibraryLocation);
enum PathGroup { FinalPaths, EffectivePaths };
static QString rawLocation(LibraryLocation, PathGroup);
#endif
private:

11
tools/configure/configureapp.cpp
View File

@ -3481,6 +3481,17 @@ void Configure::buildQmake()
}
QDir::setCurrent(pwd);
}
// Generate qt.conf
QFile confFile(buildPath + "/bin/qt.conf");
if (confFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file.
QTextStream confStream(&confFile);
confStream << "[EffectivePaths]" << endl
<< "Prefix=.." << endl;
confStream.flush();
confFile.close();
}
}
#endif