diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-15 10:42:30 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-15 10:46:06 +0000 |
| commit | 0eb4dcad8983e611e064da24e39d341c11e112c5 (patch) | |
| tree | cfb39fa9266187ffe329945dedbf5fbba14a16fc | |
| parent | 355a00270437d76fb98c14ac672ee662be0c06f5 (diff) | |
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>
| -rw-r--r-- | qmake/generators/makefiledeps.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/makefiledeps.h | 2 | ||||
| -rw-r--r-- | qmake/main.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index 7c4be64aa8..0ff64c4fbc 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -246,7 +246,7 @@ bool QMakeSourceFileInfo::mocable(const QString &file) return false; } -QMakeSourceFileInfo::QMakeSourceFileInfo(const QString &cf) +QMakeSourceFileInfo::QMakeSourceFileInfo() { //dep_mode dep_mode = Recursive; diff --git a/qmake/generators/makefiledeps.h b/qmake/generators/makefiledeps.h index 7e39396754..b97ace42a6 100644 --- a/qmake/generators/makefiledeps.h +++ b/qmake/generators/makefiledeps.h @@ -86,7 +86,7 @@ protected: public: - QMakeSourceFileInfo(const QString &cachefile=""); + QMakeSourceFileInfo(); virtual ~QMakeSourceFileInfo(); QVector<QMakeLocalFileName> dependencyPaths() const { return depdirs; } diff --git a/qmake/main.cpp b/qmake/main.cpp index dd1cca9633..7a2532eb0e 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -265,6 +265,8 @@ static bool copyFileTimes(QFile &targetFile, const QString &sourceFilePath, return false; } } +#else + Q_UNUSED(mustEnsureWritability); #endif if (!IoUtils::touchFile(targetFile.fileName(), sourceFilePath, errorString)) return false; diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 2da5861ccf..da122f75e5 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -623,6 +623,8 @@ static const char *getPrefix( # if QT_CONFIGURE_CROSSBUILD if (group == QLibraryInfo::DevicePaths) return QT_CONFIGURE_PREFIX_PATH; +# else + Q_UNUSED(group); # endif static QByteArray extPrefixPath = getExtPrefixFromHostBinDir().toLatin1(); return extPrefixPath.constData(); |