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

avoid direct use of QLibraryInfo as much as possible

Browse Source 
Change-Id: Ic1f5f5167181b15bc67bf4c6a1001532d0058b45
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2014-11-28 19:47:55 +01:00
parent 44fca87241
commit afd40dd123
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -455,8 +455,8 @@ ProjectBuilderSources::files(QMakeProject *project) const
{ {
QStringList ret = project->values(ProKey(key)).toQStringList(); QStringList ret = project->values(ProKey(key)).toQStringList();
if(key == "QMAKE_INTERNAL_INCLUDED_FILES") { if(key == "QMAKE_INTERNAL_INCLUDED_FILES") {
QString qtPrefix(QLibraryInfo::rawLocation(QLibraryInfo::PrefixPath, QLibraryInfo::EffectivePaths) + '/'); QString qtPrefix(project->propertyValue(ProKey("QT_INSTALL_PREFIX/get")).toQString() + '/');
QString qtSrcPrefix(QLibraryInfo::rawLocation(QLibraryInfo::PrefixPath, QLibraryInfo::EffectiveSourcePaths) + '/'); QString qtSrcPrefix(project->propertyValue(ProKey("QT_INSTALL_PREFIX/src")).toQString() + '/');
QStringList newret; QStringList newret;
for(int i = 0; i < ret.size(); ++i) { for(int i = 0; i < ret.size(); ++i) {

3
qmake/generators/makefile.cpp
View File

@ -45,7 +45,6 @@
#include <qhash.h> #include <qhash.h>
#include <qdebug.h> #include <qdebug.h>
#include <qbuffer.h> #include <qbuffer.h>
#include <qsettings.h>
#include <qdatetime.h> #include <qdatetime.h>
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
@ -3144,7 +3143,7 @@ MakefileGenerator::pkgConfigPrefix() const
{ {
if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX")) if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX"))
return project->first("QMAKE_PKGCONFIG_PREFIX").toQString(); return project->first("QMAKE_PKGCONFIG_PREFIX").toQString();
return QLibraryInfo::rawLocation(QLibraryInfo::PrefixPath, QLibraryInfo::FinalPaths); return project->propertyValue(ProKey("QT_INSTALL_PREFIX")).toQString();
} }
QString QString

3
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -1233,8 +1233,7 @@ void VcprojGenerator::initDeploymentTool()
// Only deploy Qt libs for shared build // Only deploy Qt libs for shared build
if (!project->values("QMAKE_QT_DLL").isEmpty()) { if (!project->values("QMAKE_QT_DLL").isEmpty()) {
// FIXME: This code should actually resolve the libraries from all Qt modules. // FIXME: This code should actually resolve the libraries from all Qt modules.
const QString &qtdir = QLibraryInfo::rawLocation(QLibraryInfo::LibrariesPath, const QString &qtdir = project->propertyValue(ProKey("QT_INSTALL_LIBS/get")).toQString();
QLibraryInfo::EffectivePaths);
ProStringList arg = project->values("QMAKE_LIBS") + project->values("QMAKE_LIBS_PRIVATE"); ProStringList arg = project->values("QMAKE_LIBS") + project->values("QMAKE_LIBS_PRIVATE");
for (ProStringList::ConstIterator it = arg.constBegin(); it != arg.constEnd(); ++it) { for (ProStringList::ConstIterator it = arg.constBegin(); it != arg.constEnd(); ++it) {
if (it->contains(qtdir)) { if (it->contains(qtdir)) {

2
qmake/option.cpp
View File

@ -37,7 +37,7 @@
#include <qregexp.h> #include <qregexp.h>
#include <qhash.h> #include <qhash.h>
#include <qdebug.h> #include <qdebug.h>
#include <qsettings.h> #include <qlibraryinfo.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>

1
qmake/option.h
View File

@ -42,7 +42,6 @@
#include <qstring.h> #include <qstring.h>
#include <qstringlist.h> #include <qstringlist.h>
#include <qfile.h> #include <qfile.h>
#include <qlibraryinfo.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

1
qmake/project.h
View File

@ -78,6 +78,7 @@ public:
using QMakeEvaluator::evaluateFeatureFile; using QMakeEvaluator::evaluateFeatureFile;
using QMakeEvaluator::evaluateConfigFeatures; using QMakeEvaluator::evaluateConfigFeatures;
using QMakeEvaluator::evaluateExpression; using QMakeEvaluator::evaluateExpression;
using QMakeEvaluator::propertyValue;
using QMakeEvaluator::values; using QMakeEvaluator::values;
using QMakeEvaluator::first; using QMakeEvaluator::first;
using QMakeEvaluator::isActiveConfig; using QMakeEvaluator::isActiveConfig;

1
qmake/property.cpp
View File

@ -36,6 +36,7 @@
#include <qdir.h> #include <qdir.h>
#include <qsettings.h> #include <qsettings.h>
#include <qlibraryinfo.h>
#include <qstringlist.h> #include <qstringlist.h>
#include <stdio.h> #include <stdio.h>