Merge remote-tracking branch 'origin/Applications/17.12'

8 years ago · 7a182c2594
parent 2d8b2c7e95 4e678cdc33
commit 7a182c2594
3 changed files with 3 additions and 2 deletions
--- a/autotests/data/file1.pdf.gz
+++ b/autotests/data/file1.pdf.gz
--- a/autotests/parttest.cpp
+++ b/autotests/parttest.cpp
@ -919,6 +919,7 @@ void PartTest::testSaveAs_data()
    QTest::addColumn<bool>("canSwapBackingFile");

    QTest::newRow("pdf") << KDESRCDIR "data/file1.pdf" << "pdf" << true << true;
+    QTest::newRow("pdf.gz") << KDESRCDIR "data/file1.pdf.gz" << "pdf" << true << true;
    QTest::newRow("epub") << KDESRCDIR "data/contents.epub" << "epub" << false << false;
    QTest::newRow("jpg") << KDESRCDIR "data/potato.jpg" << "jpg" << false << true;
 }
--- a/part.cpp
+++ b/part.cpp
@ -1366,7 +1366,7 @@ Document::OpenResult Part::doOpenFile( const QMimeType &mimeA, const QString &fi
                return Document::OpenError;
        }

-        m_fileLastModified = QFileInfo( fileNameToOpen ).lastModified();
+        m_fileLastModified = QFileInfo( localFilePath() ).lastModified();
        return Document::OpenSuccess;
    }

@ -1462,7 +1462,7 @@ Document::OpenResult Part::doOpenFile( const QMimeType &mimeA, const QString &fi

    if ( openResult == Document::OpenSuccess )
    {
-        m_fileLastModified = QFileInfo( fileNameToOpen ).lastModified();
+        m_fileLastModified = QFileInfo( localFilePath() ).lastModified();
    }
    return openResult;
 }