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/uic/cpp/cppwriteincludes.cpp | |
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/uic/cpp/cppwriteincludes.cpp')
-rw-r--r-- | src/tools/uic/cpp/cppwriteincludes.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index 4e0ee4a..2dded84 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -126,8 +126,9 @@ void WriteIncludes::acceptUI(DomUI *node) if (m_uic->hasExternalPixmap() && m_uic->pixmapFunction() == QLatin1String("qPixmapFromMimeSource")) { #ifdef QT_NO_QT3_SUPPORT - qWarning("Warning: The form file has external pixmaps or qPixmapFromMimeSource() set as a pixmap function. " - "This requires Qt 3 support, which is disabled. The resulting code will not compile."); + qWarning("%s: Warning: The form file has external pixmaps or qPixmapFromMimeSource() set as a pixmap function. " + "This requires Qt 3 support, which is disabled. The resulting code will not compile.", + qPrintable(m_uic->option().warningsPrefix())); #endif add(QLatin1String("Q3MimeSourceFactory")); } @@ -212,8 +213,9 @@ void WriteIncludes::insertIncludeForClass(const QString &className, QString head header = lowerClassName; header += QLatin1String(".h"); if (warnHeaderGeneration) { - qWarning("Warning: generated header '%s' for class '%s'.", qPrintable(header), - qPrintable(className)); + qWarning("%s: Warning: generated header '%s' for class '%s'.", + qPrintable(m_uic->option().messagePrefix()), + qPrintable(header), qPrintable(className)); } |