e3a7237d82
instead of quoting more or less random variable contents early, consistently quote everything only right before it is needed. this way we can be sure that everything is correctly quoted, but not over-quoted. this removed the need for the insanity that unescapeFilePath() and similar ad-hoc contraptions were. this had the somewhat counter-intuitive effect that it was possible to remove escapeFilePath() calls from PBX::writeSettings() calls - these were actually only unescaping. [ChangeLog][qmake][Important Behavior Changes] A lot of quoting issues have been fixed. As a side effect, qmake has become more sensitive to over-quoted file names in project files. (*) ok, maybe not. close enough. Task-number: fatal: out of memory Change-Id: I8c51cfffb59ccd156b46bd5c56754c480667443a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
85 lines
3.5 KiB
C++
85 lines
3.5 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2015 The Qt Company Ltd.
|
|
** Contact: http://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the qmake application of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL21$
|
|
** 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 http://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at http://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
** following information to ensure the GNU Lesser General Public License
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** As a special exception, The Qt Company gives you certain additional
|
|
** rights. These rights are described in The Qt Company LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef PBUILDER_PBX_H
|
|
#define PBUILDER_PBX_H
|
|
|
|
#include "unixmake.h"
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
class ProjectBuilderMakefileGenerator : public UnixMakefileGenerator
|
|
{
|
|
bool writingUnixMakefileGenerator;
|
|
QString pbx_dir;
|
|
int pbuilderVersion() const;
|
|
bool writeSubDirs(QTextStream &);
|
|
bool writeMakeParts(QTextStream &);
|
|
bool writeMakefile(QTextStream &);
|
|
|
|
QString pbxbuild();
|
|
QHash<QString, QString> keys;
|
|
QString keyFor(const QString &file);
|
|
QString findProgram(const ProString &prog);
|
|
QString fixForOutput(const QString &file);
|
|
ProStringList fixListForOutput(const char *where);
|
|
ProStringList fixListForOutput(const ProStringList &list);
|
|
int reftypeForFile(const QString &where);
|
|
QString projectSuffix() const;
|
|
enum { SettingsAsList=0x01, SettingsNoQuote=0x02 };
|
|
inline QString writeSettings(const QString &var, const char *val, int flags=0, int indent_level=0)
|
|
{ return writeSettings(var, ProString(val), flags, indent_level); }
|
|
inline QString writeSettings(const QString &var, const QString &val, int flags=0, int indent_level=0)
|
|
{ return writeSettings(var, ProString(val), flags, indent_level); }
|
|
inline QString writeSettings(const QString &var, const ProString &val, int flags=0, int indent_level=0)
|
|
{ return writeSettings(var, ProStringList(val), flags, indent_level); }
|
|
QString writeSettings(const QString &var, const ProStringList &vals, int flags=0, int indent_level=0);
|
|
|
|
public:
|
|
ProjectBuilderMakefileGenerator();
|
|
~ProjectBuilderMakefileGenerator();
|
|
|
|
virtual bool supportsMetaBuild() { return false; }
|
|
virtual bool openOutput(QFile &, const QString &) const;
|
|
protected:
|
|
bool doPrecompiledHeaders() const { return false; }
|
|
virtual bool doDepends() const { return writingUnixMakefileGenerator && UnixMakefileGenerator::doDepends(); }
|
|
};
|
|
|
|
inline ProjectBuilderMakefileGenerator::~ProjectBuilderMakefileGenerator()
|
|
{ }
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
#endif // PBUILDER_PBX_H
|