diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 18:05:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 18:05:05 (GMT) |
| commit | d030e69cbabfcae81054e5b8c893b28b2d9de38b (patch) | |
| tree | c60003ca1b12e5179c47eeb2ee48994d95fde20d /src/tools/uic/option.h | |
| parent | 526705430be6371166464689e970752a5ce41ed6 (diff) | |
| parent | 4c0e59e6ad6b697a28f7c57540fb2eb0042d04d0 (diff) | |
| download | Qt-d030e69cbabfcae81054e5b8c893b28b2d9de38b.zip Qt-d030e69cbabfcae81054e5b8c893b28b2d9de38b.tar.gz Qt-d030e69cbabfcae81054e5b8c893b28b2d9de38b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Work around a compiler bug on 64-bit.
Fix handling of braces/no-braces in QUrl::host / setHost.
Changes (and minor corrections) to QByteArray documentation.
QtWebKit: Update tag files to match the same content on qtwebkit.git
QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.
QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.
uic: Fix compile breakage in case QT_NO_QT3_SUPPORT.
uic: Improve messages.
Tools (uic/rcc): Improve warning messages.
QDir: Removed checks for existance of fileEngine
QDir and QFileInfo shouldn't lose properties when detaching
Another bug-o introduced in fixing QDirPrivate refactoring
Reverting QDir::detach introduced earlier
QFileInfo: Prepare for engine-less implementation
Removed QFileInfoPrivate::initFileEngine
Simplify QDir::cd
QDir::makeAbsolute could self-destruct on failure
QDir::operator= simplification
QDirPrivate refactoring
QDirPrivate refactoring
...
Diffstat (limited to 'src/tools/uic/option.h')
| -rw-r--r-- | src/tools/uic/option.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/tools/uic/option.h b/src/tools/uic/option.h index 8556728..011a8f8 100644 --- a/src/tools/uic/option.h +++ b/src/tools/uic/option.h @@ -43,6 +43,7 @@ #define OPTION_H #include <QtCore/QString> +#include <QtCore/QDir> QT_BEGIN_NAMESPACE @@ -91,6 +92,13 @@ struct Option generator(CppGenerator), prefix(QLatin1String("Ui_")) { indent.fill(QLatin1Char(' '), 4); } + + QString messagePrefix() const + { + return inputFile.isEmpty() ? + QString(QLatin1String("stdin")) : + QDir::toNativeSeparators(inputFile); + } }; QT_END_NAMESPACE |