Merge changes from topic 'bug332914'
commit4b683168965142298cb0e368f899863703414bc8
authorJan Kundrát <jkt@kde.org>
Wed, 27 Dec 2017 15:01:40 +0000 (27 16:01 +0100)
committerGerrit Code Review <noreply@kde.org>
Wed, 27 Dec 2017 15:01:40 +0000 (27 16:01 +0100)
treeb6557e129fa30d17a70f215a82b3d28c95ff9657
parent284c3daa5ec726339c7cfb02967a0b4bdfdf2070
parentc1c85d49bc0a2f1348048af61ed0f8fecc450da0
Merge changes from topic 'bug332914'

* changes:
  Add tests for threading & searching combo
  Fix search with threading
src/Gui/Window.cpp