diff --git a/src/lib/resultiterator.cpp b/src/lib/resultiterator.cpp
index b8c71c30..74392723 100644
--- a/src/lib/resultiterator.cpp
+++ b/src/lib/resultiterator.cpp
@@ -1,69 +1,78 @@
 /*
  * This file is part of the KDE Baloo Project
  * Copyright (C) 2013  Vishesh Handa <me@vhanda.in>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) version 3, or any
  * later version accepted by the membership of KDE e.V. (or its
  * successor approved by the membership of KDE e.V.), which shall
  * act as a proxy defined in Section 6 of version 3 of the license.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 #include "resultiterator.h"
 #include "searchstore.h"
 
 #include <QVector>
 
 using namespace Baloo;
 
 class Baloo::ResultIteratorPrivate {
 public:
     ResultIteratorPrivate() : pos(-1)
     {}
 
     ~ResultIteratorPrivate() {
     }
 
     QStringList results;
     int pos;
 };
 
 ResultIterator::ResultIterator(const QStringList& results)
     : d(new ResultIteratorPrivate)
 {
     d->results = results;
     d->pos = -1;
 }
 
+// TODO Remove for KF6
 ResultIterator::ResultIterator(const ResultIterator& rhs)
     : d(rhs.d)
 {
+    qWarning("ResultIterator copy constructor being used. This is crashy");
+}
+
+
+ResultIterator::ResultIterator(ResultIterator &&rhs)
+    : d(rhs.d)
+{
+    rhs.d = nullptr;
 }
 
 ResultIterator::~ResultIterator()
 {
     delete d;
 }
 
 bool ResultIterator::next()
 {
     d->pos++;
     return d->pos < d->results.size();
 }
 
 QString ResultIterator::filePath() const
 {
     Q_ASSERT(d->pos >= 0 && d->pos < d->results.size());
     return d->results.at(d->pos);
 }
diff --git a/src/lib/resultiterator.h b/src/lib/resultiterator.h
index 55aa17f6..cfdf69f5 100644
--- a/src/lib/resultiterator.h
+++ b/src/lib/resultiterator.h
@@ -1,56 +1,61 @@
 /*
  * This file is part of the KDE Baloo Project
  * Copyright (C) 2013  Vishesh Handa <me@vhanda.in>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) version 3, or any
  * later version accepted by the membership of KDE e.V. (or its
  * successor approved by the membership of KDE e.V.), which shall
  * act as a proxy defined in Section 6 of version 3 of the license.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 #ifndef BALOO_CORE_RESULT_ITERATOR_H
 #define BALOO_CORE_RESULT_ITERATOR_H
 
 #include "core_export.h"
 
 #include <QString>
 
 namespace Baloo {
 
 class SearchStore;
 class Result;
 class ResultIteratorPrivate;
 
 /**
  * @class ResultIterator resultiterator.h <Baloo/ResultIterator>
  */
 class BALOO_CORE_EXPORT ResultIterator
 {
 public:
-    ResultIterator(const ResultIterator& rhs);
+    ResultIterator(ResultIterator &&rhs);
     ~ResultIterator();
 
+    // TODO KF6 mark this as delete
+    /** Do not use this function, ResultIterator is not copiable, move it if needed */
+    BALOO_CORE_DEPRECATED ResultIterator(const ResultIterator& rhs);
+    ResultIterator &operator=(const ResultIterator& rhs) = delete;
+
     bool next();
     QString filePath() const;
 
 private:
     ResultIterator(const QStringList& results);
     ResultIteratorPrivate* d;
 
     friend class Query;
 };
 
 }
 #endif // BALOO_CORE_RESULT_ITERATOR_H