Changeset 846 for trunk/src/tools/uic/cpp/cppwriteincludes.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/tools/uic/cpp/cppwriteincludes.cpp (modified) (3 diffs)

trunk/src/tools/uic/cpp/cppwriteincludes.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -127 +127 @@
     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().messagePrefix()));
 #endif
         add(QLatin1String("Q3MimeSourceFactory"));
@@ -213 +214 @@
         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));
 
         }