782ebeada1
Conflicts: qmake/library/qmakebuiltins.cpp qmake/library/qmakeevaluator.cpp qmake/library/qmakeevaluator.h qmake/project.h QMakeEvaluator: * evaluateConditional(): one side changed return type, the other changed a parameter type. * split_value_list(): one side changed a parameter adjacent to where ... * expandVariableReferences(): ... the other killed one overload and changed the survivor src/corelib/io/qlockfile_unix.cpp One side changed a #if condition, the other moved NETBSD's part of what it controlled. src/corelib/tools/qdatetime.cpp One side fixed a reachable Q_UNREACHABLE in toMSecsSinceEpoch(), the other moved it from the private class to the public one, in the midst of the "short date-time" optimization, which confused diff entirely. One side changed a QStringLiteral to QLatin1String, the other rewrote adjoining code. src/network/kernel/qauthenticator.cpp Both rewrote a line, equivalently; kept the dev version. src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h One side changed #if-ery that the other removed. tools/configure/configureapp.cpp One side added a check to -target parsing; the other killed -target. tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml tests/auto/testlib/selftests/expected_cmptest.xunitxml Regenerated using generate_expected_output.py I note that quite a few other expected_* come out changed, now. There was no git-conflict in src/widgets/kernel/qformlayout.cpp but it didn't compile; one side removed some unused methods; the other found uses for one of them. Put FixedColumnMatrix<>::removeRow(int) back for its new user. Change-Id: I8cc2a71add48c0a848e13cfc47b5a7754e8ca584
162 lines
5.1 KiB
C++
162 lines
5.1 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the qmake application of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "project.h"
|
|
|
|
#include "option.h"
|
|
#include <qmakeevaluator_p.h>
|
|
|
|
#include <qdir.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
using namespace QMakeInternal;
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
QMakeProject::QMakeProject()
|
|
: QMakeEvaluator(Option::globals, Option::parser, Option::vfs, &Option::evalHandler)
|
|
{
|
|
}
|
|
|
|
QMakeProject::QMakeProject(QMakeProject *p)
|
|
: QMakeEvaluator(Option::globals, Option::parser, Option::vfs, &Option::evalHandler)
|
|
{
|
|
initFrom(p);
|
|
}
|
|
|
|
bool QMakeProject::boolRet(VisitReturn vr)
|
|
{
|
|
if (vr == ReturnError)
|
|
exit(3);
|
|
Q_ASSERT(vr == ReturnTrue || vr == ReturnFalse);
|
|
return vr != ReturnFalse;
|
|
}
|
|
|
|
bool QMakeProject::read(const QString &project, LoadFlags what)
|
|
{
|
|
m_projectFile = project;
|
|
setOutputDir(Option::output_dir);
|
|
QString absproj = (project == QLatin1String("-"))
|
|
? QLatin1String("(stdin)")
|
|
: QDir::cleanPath(QDir(qmake_getpwd()).absoluteFilePath(project));
|
|
m_projectDir = QFileInfo(absproj).path();
|
|
return boolRet(evaluateFile(absproj, QMakeHandler::EvalProjectFile, what));
|
|
}
|
|
|
|
static ProStringList prepareBuiltinArgs(const QList<ProStringList> &args)
|
|
{
|
|
ProStringList ret;
|
|
ret.reserve(args.size());
|
|
for (const ProStringList &arg : args)
|
|
ret << arg.join(' ');
|
|
return ret;
|
|
}
|
|
|
|
bool QMakeProject::test(const ProKey &func, const QList<ProStringList> &args)
|
|
{
|
|
m_current.clear();
|
|
|
|
if (int func_t = statics.functions.value(func))
|
|
return boolRet(evaluateBuiltinConditional(func_t, func, prepareBuiltinArgs(args)));
|
|
|
|
QHash<ProKey, ProFunctionDef>::ConstIterator it =
|
|
m_functionDefs.testFunctions.constFind(func);
|
|
if (it != m_functionDefs.testFunctions.constEnd())
|
|
return boolRet(evaluateBoolFunction(*it, args, func));
|
|
|
|
evalError(QStringLiteral("'%1' is not a recognized test function.")
|
|
.arg(func.toQString(m_tmp1)));
|
|
return false;
|
|
}
|
|
|
|
QStringList QMakeProject::expand(const ProKey &func, const QList<ProStringList> &args)
|
|
{
|
|
m_current.clear();
|
|
|
|
if (int func_t = statics.expands.value(func))
|
|
return evaluateBuiltinExpand(func_t, func, prepareBuiltinArgs(args)).toQStringList();
|
|
|
|
QHash<ProKey, ProFunctionDef>::ConstIterator it =
|
|
m_functionDefs.replaceFunctions.constFind(func);
|
|
if (it != m_functionDefs.replaceFunctions.constEnd()) {
|
|
ProStringList ret;
|
|
if (evaluateFunction(*it, args, &ret) == QMakeProject::ReturnError)
|
|
exit(3);
|
|
return ret.toQStringList();
|
|
}
|
|
|
|
evalError(QStringLiteral("'%1' is not a recognized replace function.")
|
|
.arg(func.toQString(m_tmp1)));
|
|
return QStringList();
|
|
}
|
|
|
|
ProString QMakeProject::expand(const QString &expr, const QString &where, int line)
|
|
{
|
|
ProString ret;
|
|
ProFile *pro = m_parser->parsedProBlock(QStringRef(&expr), where, line,
|
|
QMakeParser::ValueGrammar);
|
|
if (pro->isOk()) {
|
|
m_current.pro = pro;
|
|
m_current.line = 0;
|
|
const ushort *tokPtr = pro->tokPtr();
|
|
ProStringList result;
|
|
if (expandVariableReferences(tokPtr, 1, &result, true) == ReturnError)
|
|
exit(3);
|
|
if (!result.isEmpty())
|
|
ret = result.at(0);
|
|
}
|
|
pro->deref();
|
|
return ret;
|
|
}
|
|
|
|
bool QMakeProject::isEmpty(const ProKey &v) const
|
|
{
|
|
ProValueMap::ConstIterator it = m_valuemapStack.first().constFind(v);
|
|
return it == m_valuemapStack.first().constEnd() || it->isEmpty();
|
|
}
|
|
|
|
void QMakeProject::dump() const
|
|
{
|
|
QStringList out;
|
|
for (ProValueMap::ConstIterator it = m_valuemapStack.first().begin();
|
|
it != m_valuemapStack.first().end(); ++it) {
|
|
if (!it.key().startsWith('.')) {
|
|
QString str = it.key() + " =";
|
|
for (const ProString &v : it.value())
|
|
str += ' ' + formatValue(v);
|
|
out << str;
|
|
}
|
|
}
|
|
out.sort();
|
|
for (const QString &v : qAsConst(out))
|
|
puts(qPrintable(v));
|
|
}
|
|
|
|
QT_END_NAMESPACE
|