diff options
author | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-06-16 17:15:48 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-06-16 17:15:48 +0200 |
commit | e73e36a16bb51fa66bdccc780f177e2c4d5d8092 (patch) | |
tree | 12b6de8d0cb5c630a05f28686d4baabe474dbfda /tools/assistant/lib/qhelpgenerator.cpp | |
parent | 237a3e690f290fd8ef8ef2a51459caa7fdc7bef1 (diff) | |
parent | d4ea3957a535ac522bd29b0645e614e0ccd09f82 (diff) | |
download | qt4-tools-e73e36a16bb51fa66bdccc780f177e2c4d5d8092.tar.gz |
Merge license header changes from 4.5
Diffstat (limited to 'tools/assistant/lib/qhelpgenerator.cpp')
-rw-r--r-- | tools/assistant/lib/qhelpgenerator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/assistant/lib/qhelpgenerator.cpp b/tools/assistant/lib/qhelpgenerator.cpp index 8512adbdd0..04506ef6c3 100644 --- a/tools/assistant/lib/qhelpgenerator.cpp +++ b/tools/assistant/lib/qhelpgenerator.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the Qt Assistant of the Qt Toolkit. ** @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. +** contact the sales department at http://www.qtsoftware.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -533,7 +533,7 @@ bool QHelpGenerator::insertFiles(const QStringList &files, const QString &rootPa stream.setCodec(QTextCodec::codecForName(charSet.toLatin1().constData())); title = QHelpGlobal::documentTitle(stream.readAll()); } else { - title = fi.fileName(); + title = fileName.mid(fileName.lastIndexOf(QLatin1Char('/')) + 1); } int fileId = -1; |