File 0001-Do-not-use-qfileinfo-metadatachangetime-if... of Package baloo5

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Do-not-use-qfileinfo-metadatachangetime-if-Qt-lt-5.10.patch of Package baloo5 (Revision bd7b2b1ce487856b820a5fd0a845ab83)

Currently displaying revision bd7b2b1ce487856b820a5fd0a845ab83 , Show latest

From d1a289b4b94903d86a60efc7f1cdc55fd7364b54 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Mon, 7 Jan 2019 00:26:27 +0100
Subject: Remove Qt 5.10 checks now that we require it as min version

---
 src/file/modifiedfileindexer.cpp   | 4 ----
 src/file/unindexedfileiterator.cpp | 4 ----
 src/tools/balooshow/main.cpp       | 4 ----
 3 files changed, 12 deletions(-)

Reverted by Antonio Larrosa <alarrosa@suse.com> so Qt 5.9 is still
supported

diff --git a/src/file/modifiedfileindexer.cpp b/src/file/modifiedfileindexer.cpp
index b609b7b..6ac9f82 100644
--- a/src/file/modifiedfileindexer.cpp
+++ b/src/file/modifiedfileindexer.cpp
@@ -79,7 +79,11 @@ void ModifiedFileIndexer::run()
         }
 
         bool mTimeChanged = timeInfo.mTime != fileInfo.lastModified().toTime_t();
+#if QT_VERSION >= QT_VERSION_CHECK(5,10,0)
         bool cTimeChanged = timeInfo.cTime != fileInfo.metadataChangeTime().toTime_t();
+#else
+        bool cTimeChanged = timeInfo.cTime != fileInfo.created().toTime_t();
+#endif
 
         if (!mTimeChanged && !cTimeChanged) {
             continue;
diff --git a/src/file/unindexedfileiterator.cpp b/src/file/unindexedfileiterator.cpp
index 80f4b49..4417874 100644
--- a/src/file/unindexedfileiterator.cpp
+++ b/src/file/unindexedfileiterator.cpp
@@ -114,7 +114,11 @@ bool UnIndexedFileIterator::shouldIndex(const QString& filePath, const QString&
         m_mTimeChanged = true;
     }
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,10,0)
     auto fileMTime = fileInfo.metadataChangeTime().toTime_t();
+#else
+    auto fileMTime = fileInfo.created().toTime_t();
+#endif
     if (timeInfo.cTime != fileMTime) {
         m_cTimeChanged = true;
     }
diff --git a/src/tools/balooshow/main.cpp b/src/tools/balooshow/main.cpp
index 78f24de..4419bc1 100644
--- a/src/tools/balooshow/main.cpp
+++ b/src/tools/balooshow/main.cpp
@@ -232,7 +232,11 @@ int main(int argc, char* argv[])
                         int propNum = prop.toInt(&ok);
                         QString value = word.mid(posOfNonNumeric + 1);
                         if (!ok) {
+#if QT_VERSION >= QT_VERSION_CHECK(5,10,0)
                             auto error = QString("malformed property term (bad index): '%1' in '%2'\n").arg(prop).arg(arrAsPrintable());
+#else
+                            auto error = QString("malformed property term (bad index): '%1' in '%2'\n").arg(prop.toString()).arg(arrAsPrintable());
+#endif
                             stream << errorPrefix.subs(error).toString();
                             continue;
                         }
-- 
cgit v1.1

Places

File 0001-Do-not-use-qfileinfo-metadatachangetime-if-Qt-lt-5.10.patch of Package baloo5 (Revision bd7b2b1ce487856b820a5fd0a845ab83)

Places