Changeset 846 for trunk/src/tools/uic/option.h

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/option.h (modified) (4 diffs)

trunk/src/tools/uic/option.h

@@ -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)
@@ -44 +44 @@
 
 #include <QtCore/QString>
+#include <QtCore/QDir>
 
 QT_BEGIN_NAMESPACE
@@ -62 +63 @@
     unsigned int dependencies : 1;
     unsigned int extractImages : 1;
+    unsigned int limitXPM_LineLength : 1;
     unsigned int implicitIncludes: 1;
     Generator generator;
@@ -86 +88 @@
           dependencies(0),
           extractImages(0),
+          limitXPM_LineLength(0),
           implicitIncludes(1),
           generator(CppGenerator),
           prefix(QLatin1String("Ui_"))
     { indent.fill(QLatin1Char(' '), 4); }
+
+    QString messagePrefix() const
+    {
+        return inputFile.isEmpty() ?
+               QString(QLatin1String("stdin")) :
+               QDir::toNativeSeparators(inputFile);
+    }
 };