Fix developer build with -Werror

The group parameter is only used when cross-compiling, mark it as unused
otherwise. This is noticeable in the cmake branch because there we build
qmake with cmake and apply the same warning flags, as opposed to the
bootstrapped qmake build when using ... qmake.

The cache file parameter in qmake is unused and the
mustEnsureWritability is only used on Windows.

Change-Id: I08655d5150f5a967c2340ee7678bad3a4d69914f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Simon Hausmann 2019-10-15 10:42:30 +02:00
parent 355a002704
commit 0eb4dcad89
4 changed files with 6 additions and 2 deletions

View File

@ -246,7 +246,7 @@ bool QMakeSourceFileInfo::mocable(const QString &file)
return false; return false;
} }
QMakeSourceFileInfo::QMakeSourceFileInfo(const QString &cf) QMakeSourceFileInfo::QMakeSourceFileInfo()
{ {
//dep_mode //dep_mode
dep_mode = Recursive; dep_mode = Recursive;

View File

@ -86,7 +86,7 @@ protected:
public: public:
QMakeSourceFileInfo(const QString &cachefile=""); QMakeSourceFileInfo();
virtual ~QMakeSourceFileInfo(); virtual ~QMakeSourceFileInfo();
QVector<QMakeLocalFileName> dependencyPaths() const { return depdirs; } QVector<QMakeLocalFileName> dependencyPaths() const { return depdirs; }

View File

@ -265,6 +265,8 @@ static bool copyFileTimes(QFile &targetFile, const QString &sourceFilePath,
return false; return false;
} }
} }
#else
Q_UNUSED(mustEnsureWritability);
#endif #endif
if (!IoUtils::touchFile(targetFile.fileName(), sourceFilePath, errorString)) if (!IoUtils::touchFile(targetFile.fileName(), sourceFilePath, errorString))
return false; return false;

View File

@ -623,6 +623,8 @@ static const char *getPrefix(
# if QT_CONFIGURE_CROSSBUILD # if QT_CONFIGURE_CROSSBUILD
if (group == QLibraryInfo::DevicePaths) if (group == QLibraryInfo::DevicePaths)
return QT_CONFIGURE_PREFIX_PATH; return QT_CONFIGURE_PREFIX_PATH;
# else
Q_UNUSED(group);
# endif # endif
static QByteArray extPrefixPath = getExtPrefixFromHostBinDir().toLatin1(); static QByteArray extPrefixPath = getExtPrefixFromHostBinDir().toLatin1();
return extPrefixPath.constData(); return extPrefixPath.constData();