diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-09-07 13:56:34 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-09-07 13:56:34 (GMT) |
| commit | b21639304b108de0697553f062eb36ccde6a5bd5 (patch) | |
| tree | 0b34d0cf81742bfb34250c0f1e4350c9ab692ef7 /src/tools/rcc | |
| parent | 3505c6cdcdfac5a6d0f4b94dbdbcc8ad72f8048a (diff) | |
| download | Qt-b21639304b108de0697553f062eb36ccde6a5bd5.zip Qt-b21639304b108de0697553f062eb36ccde6a5bd5.tar.gz Qt-b21639304b108de0697553f062eb36ccde6a5bd5.tar.bz2 | |
Tools (uic/rcc): Improve warning messages.
Output as 'filename: Warning: message' and make some uic
warnings more verbose to make Qt Creator parsing easier.
Fix resource warning in Qt Designer.
Reviewed-by: dt
Rubber-stamped-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/tools/rcc')
| -rw-r--r-- | src/tools/rcc/rcc.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 1f6e58f..0e3167d 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -544,8 +544,11 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file) const QString filename = nodes.at(nodes.size()-1); RCCFileInfo *s = new RCCFileInfo(file); s->m_parent = parent; - if (parent->m_children.contains(filename)) - qWarning("potential duplicate alias detected: '%s'", qPrintable(filename)); + if (parent->m_children.contains(filename)) { + foreach (const QString &fileName, m_fileNames) + qWarning("%s: Warning: potential duplicate alias detected: '%s'", + qPrintable(fileName), qPrintable(filename)); + } parent->m_children.insertMulti(filename, s); return true; } |