diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-21 18:03:10 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-05-07 11:50:13 +0000 |
| commit | 97d7a00989f8d5df15eb68d90c1af547b67b3fa4 (patch) | |
| tree | 0d9a871eedfa889c2c8fc145b7c989e05cfaf50a /src/tools/rcc/rcc.h | |
| parent | 4d15f393a76cfcc4d54f311884fedac5bf0f72ee (diff) | |
rcc: don't drop entries with missing files in -list mode
the files may not exist _yet_. this change allows dynamically generating
the resource contents.
the ignoreErrors parameter is renamed to listMode and made less
aggressive, to better reflect the actual usage.
Change-Id: I2f6a75a23f1ef903f0d957f9a09f4df0ce2a2b35
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/tools/rcc/rcc.h')
| -rw-r--r-- | src/tools/rcc/rcc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h index 19e04e401d..36984cf38a 100644 --- a/src/tools/rcc/rcc.h +++ b/src/tools/rcc/rcc.h @@ -53,7 +53,7 @@ public: bool output(QIODevice &outDevice, QIODevice &tempDevice, QIODevice &errorDevice); - bool readFiles(bool ignoreErrors, QIODevice &errorDevice); + bool readFiles(bool listMode, QIODevice &errorDevice); enum Format { Binary, C_Code, Pass1, Pass2 }; void setFormat(Format f) { m_format = f; } @@ -109,7 +109,7 @@ private: void reset(); bool addFile(const QString &alias, const RCCFileInfo &file); bool interpretResourceFile(QIODevice *inputDevice, const QString &file, - QString currentPath = QString(), bool ignoreErrors = false); + QString currentPath = QString(), bool listMode = false); bool writeHeader(); bool writeDataBlobs(); bool writeDataNames(); |