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
111 lines
4.0 KiB
C++
111 lines
4.0 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$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef PROJECT_H
|
|
#define PROJECT_H
|
|
|
|
#include <qmakeevaluator.h>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
class QMakeProject : private QMakeEvaluator
|
|
{
|
|
QString m_projectFile;
|
|
QString m_projectDir;
|
|
|
|
public:
|
|
QMakeProject();
|
|
QMakeProject(QMakeProject *p);
|
|
|
|
bool read(const QString &project, LoadFlags what = LoadAll);
|
|
|
|
QString projectFile() const { return m_projectFile; }
|
|
QString projectDir() const { return m_projectDir; }
|
|
QString sourceRoot() const { return m_sourceRoot.isEmpty() ? m_buildRoot : m_sourceRoot; }
|
|
QString buildRoot() const { return m_buildRoot; }
|
|
QString confFile() const { return m_conffile; }
|
|
QString cacheFile() const { return m_cachefile; }
|
|
QString specDir() const { return m_qmakespec; }
|
|
|
|
ProString expand(const QString &v, const QString &file, int line);
|
|
QStringList expand(const ProKey &func, const QList<ProStringList> &args);
|
|
bool test(const QString &v, const QString &file, int line)
|
|
{ m_current.clear(); return evaluateConditional(QStringRef(&v), file, line) == ReturnTrue; }
|
|
bool test(const ProKey &func, const QList<ProStringList> &args);
|
|
|
|
bool isSet(const ProKey &v) const { return m_valuemapStack.first().contains(v); }
|
|
bool isEmpty(const ProKey &v) const;
|
|
ProStringList &values(const ProKey &v) { return valuesRef(v); }
|
|
int intValue(const ProKey &v, int defaultValue = 0) const;
|
|
const ProValueMap &variables() const { return m_valuemapStack.first(); }
|
|
ProValueMap &variables() { return m_valuemapStack.first(); }
|
|
bool isActiveConfig(const QString &config, bool regex = false)
|
|
{ return QMakeEvaluator::isActiveConfig(QStringRef(&config), regex); }
|
|
|
|
void dump() const;
|
|
|
|
using QMakeEvaluator::LoadFlags;
|
|
using QMakeEvaluator::VisitReturn;
|
|
using QMakeEvaluator::setExtraVars;
|
|
using QMakeEvaluator::setExtraConfigs;
|
|
using QMakeEvaluator::loadSpec;
|
|
using QMakeEvaluator::evaluateFeatureFile;
|
|
using QMakeEvaluator::evaluateConfigFeatures;
|
|
using QMakeEvaluator::evaluateExpression;
|
|
using QMakeEvaluator::propertyValue;
|
|
using QMakeEvaluator::values;
|
|
using QMakeEvaluator::first;
|
|
using QMakeEvaluator::isHostBuild;
|
|
using QMakeEvaluator::dirSep;
|
|
|
|
private:
|
|
static bool boolRet(VisitReturn vr);
|
|
};
|
|
|
|
/*!
|
|
* For variables that are supposed to contain a single int,
|
|
* this method returns the numeric value.
|
|
* Only the first value of the variable is taken into account.
|
|
* The string representation is assumed to look like a C int literal.
|
|
*/
|
|
inline int QMakeProject::intValue(const ProKey &v, int defaultValue) const
|
|
{
|
|
const ProString &str = first(v);
|
|
if (!str.isEmpty()) {
|
|
bool ok;
|
|
int i = str.toInt(&ok, 0);
|
|
if (ok)
|
|
return i;
|
|
}
|
|
return defaultValue;
|
|
}
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
#endif // PROJECT_H
|