From e863f7227d6f64abef732765ec6c24fa2d436810 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 9 Feb 2017 15:19:32 +0530
Subject: [PATCH] Fix Get Books result list and jobs list not being populated
 on Qt 5.8

Apparently Qt 5.8 broke the layoutChanged() signal for models. Replace it
with modelReset()
---
 src/calibre/gui2/jobs.py                |  8 ++++----
 src/calibre/gui2/store/search/models.py | 16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/calibre/gui2/jobs.py b/src/calibre/gui2/jobs.py
index 9ae5566d2d..dcef6c3096 100644
--- a/src/calibre/gui2/jobs.py
+++ b/src/calibre/gui2/jobs.py
@@ -191,9 +191,9 @@ class JobManager(QAbstractTableModel, AdaptSQP):  # {{{
                     if job.is_finished:
                         self.job_done.emit(len(self.unfinished_jobs()))
             if needs_reset:
-                self.layoutAboutToBeChanged.emit()
+                self.modelAboutToBeReset.emit()
                 self.jobs.sort()
-                self.layoutChanged.emit()
+                self.modelReset.emit()
             else:
                 for job in jobs:
                     idx = self.jobs.index(job)
@@ -216,11 +216,11 @@ class JobManager(QAbstractTableModel, AdaptSQP):  # {{{
                         self.server.kill_job(job)
 
     def _add_job(self, job):
-        self.layoutAboutToBeChanged.emit()
+        self.modelAboutToBeReset.emit()
         self.jobs.append(job)
         self.jobs.sort()
         self.job_added.emit(len(self.unfinished_jobs()))
-        self.layoutChanged.emit()
+        self.modelReset.emit()
 
     def done_jobs(self):
         return [j for j in self.jobs if j.is_finished]
diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py
index 339bd17362..f29f1bf280 100644
--- a/src/calibre/gui2/store/search/models.py
+++ b/src/calibre/gui2/store/search/models.py
@@ -87,7 +87,7 @@ class Matches(QAbstractItemModel):
 
     def add_result(self, result, store_plugin):
         if result not in self.all_matches:
-            self.layoutAboutToBeChanged.emit()
+            self.modelAboutToBeReset.emit()
             self.all_matches.append(result)
             self.search_filter.add_search_result(result)
             if result.cover_url:
@@ -96,8 +96,8 @@ class Matches(QAbstractItemModel):
             else:
                 result.cover_queued = False
             self.details_pool.add_task(result, store_plugin, self.got_result_details_dispatcher)
-            self.filter_results()
-            self.layoutChanged.emit()
+            self._filter_results()
+            self.modelReset.emit()
 
     def get_result(self, index):
         row = index.row()
@@ -109,8 +109,7 @@ class Matches(QAbstractItemModel):
     def has_results(self):
         return len(self.matches) > 0
 
-    def filter_results(self):
-        self.layoutAboutToBeChanged.emit()
+    def _filter_results(self):
         # Only use the search filter's filtered results when there is a query
         # and it is a filterable query. This allows for the stores best guess
         # matches to come though.
@@ -120,7 +119,11 @@ class Matches(QAbstractItemModel):
             self.matches = list(self.search_filter.universal_set())
         self.total_changed.emit(self.rowCount())
         self.sort(self.sort_col, self.sort_order, False)
-        self.layoutChanged.emit()
+
+    def filter_results(self):
+        self.modelAboutToBeReset.emit()
+        self._filter_results()
+        self.modelReset.emit()
 
     def got_result_details(self, result):
         if not result.cover_queued and result.cover_url:
@@ -470,4 +473,3 @@ class SearchFilter(SearchQueryParser):
         punctuation is removed first, so that a.and.b becomes a b '''
         field = force_unicode(field)
         return self.joiner_pat.sub(' ', field.translate(self.punctuation_table))
-