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

qmake: Cleanup

Browse Source 
Fix clang warnings that are disabled in the default build.

Change-Id: I4e773a24884db94acdc6c295d3f66da07cd8a5bd
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
This commit is contained in:
Kai Koehne 2019-06-05 10:47:28 +02:00
parent 761f88f8ba
commit 5f30fd6426
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -518,7 +518,6 @@ bool
ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
{ {
ProStringList tmp; ProStringList tmp;
bool did_preprocess = false;
//HEADER //HEADER
const int pbVersion = pbuilderVersion(); const int pbVersion = pbuilderVersion();
@ -736,7 +735,6 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
QFile mkf(mkfile); QFile mkf(mkfile);
if(mkf.open(QIODevice::WriteOnly | QIODevice::Text)) { if(mkf.open(QIODevice::WriteOnly | QIODevice::Text)) {
writingUnixMakefileGenerator = true; writingUnixMakefileGenerator = true;
did_preprocess = true;
debug_msg(1, "pbuilder: Creating file: %s", mkfile.toLatin1().constData()); debug_msg(1, "pbuilder: Creating file: %s", mkfile.toLatin1().constData());
QTextStream mkt(&mkf); QTextStream mkt(&mkf);
writeHeader(mkt); writeHeader(mkt);

2
qmake/generators/makefile.cpp
View File

@ -900,7 +900,7 @@ MakefileGenerator::processPrlFile(QString &file, bool baseOnly)
bool bool
MakefileGenerator::processPrlFileBase(QString &origFile, const QStringRef &origName, MakefileGenerator::processPrlFileBase(QString &origFile, const QStringRef &origName,
const QStringRef &fixedBase, int slashOff) const QStringRef &fixedBase, int /*slashOff*/)
{ {
return processPrlFileCore(origFile, origName, fixedBase + Option::prl_ext); return processPrlFileCore(origFile, origName, fixedBase + Option::prl_ext);
} }

2
qmake/generators/makefiledeps.cpp
View File

@ -815,7 +815,7 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file)
break; break;
} }
cpp_state = InCode; cpp_state = InCode;
// ... and fall through to handle buffer[x] as such. Q_FALLTHROUGH(); // to handle buffer[x] as such.
case InCode: case InCode:
// matching quotes (string literals and character literals) // matching quotes (string literals and character literals)
if (buffer[x] == '\'' || buffer[x] == '"') { if (buffer[x] == '\'' || buffer[x] == '"') {

2
qmake/generators/projectgenerator.h
View File

@ -43,7 +43,7 @@ protected:
void init() override; void init() override;
bool writeMakefile(QTextStream &) override; bool writeMakefile(QTextStream &) override;
QString escapeFilePath(const QString &path) const override { Q_ASSERT(false); return QString(); } QString escapeFilePath(const QString &) const override { Q_ASSERT(false); return QString(); }
public: public:
ProjectGenerator(); ProjectGenerator();

1
qmake/generators/win32/msvc_objectmodel.cpp
View File

@ -1990,6 +1990,7 @@ bool VCMIDLTool::parseOption(const char* option)
break; break;
case 0x5eb7af2: // /header filename case 0x5eb7af2: // /header filename
offset = 5; offset = 5;
Q_FALLTHROUGH();
case 0x0000358: // /h filename case 0x0000358: // /h filename
HeaderFileName = option + offset + 3; HeaderFileName = option + offset + 3;
break; break;

2
qmake/generators/win32/winmakefile.cpp
View File

@ -671,7 +671,7 @@ void Win32MakefileGenerator::writeObjectsPart(QTextStream &t)
t << "OBJECTS = " << valList(escapeDependencyPaths(project->values("OBJECTS"))) << endl; t << "OBJECTS = " << valList(escapeDependencyPaths(project->values("OBJECTS"))) << endl;
} }
void Win32MakefileGenerator::writeImplicitRulesPart(QTextStream &t) void Win32MakefileGenerator::writeImplicitRulesPart(QTextStream &)
{ {
} }