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

make magicValues() const 

the weird debugging feature is not used anyway

Change-Id: I07f481a94f2b2ab2a5b61270f0e00183cefd4cd1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
bb10
Oswald Buddenhagen 2012-04-23 16:57:01 +02:00
parent f85292ab20
commit cb43947738
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qmake/project.cpp
View File

@ -3758,17 +3758,14 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString
return ret;
}
QStringList &QMakeProject::magicValues(const QString &_var, QHash<QString, QStringList> &place)
QStringList QMakeProject::magicValues(const QString &_var, const QHash<QString, QStringList> &place) const
{
QString var = varMap(_var);
if (var == QLatin1String("_LINE_")) { //parser line number
var = ".BUILTIN." + var;
place[var] = QStringList(QString::number(parser.line_no));
return QStringList(QString::number(parser.line_no));
} else if(var == QLatin1String("_FILE_")) { //parser file
var = ".BUILTIN." + var;
place[var] = QStringList(parser.file);
return QStringList(parser.file);
}
//qDebug("REPLACE [%s]->[%s]", qPrintable(var), qPrintable(place[var].join("::")));
return place[var];
}

2
qmake/project.h
View File

@ -117,7 +117,7 @@ class QMakeProject
void loadDefaults();
void setupProject();
QStringList &values(const QString &v, QHash<QString, QStringList> &place);
QStringList &magicValues(const QString &v, QHash<QString, QStringList> &place);
QStringList magicValues(const QString &v, const QHash<QString, QStringList> &place) const;
QStringList qmakeFeaturePaths();
public: