1. 24 Oct, 2017 2 commits
  2. 22 Oct, 2017 2 commits
    • David Faure's avatar
      Dictionary Engine: fix synchronization issues. · 02d8fbfb
      David Faure authored
      Summary:
      QMutex isn't the right tool for this:
      * If tryLock succeeds, the code didn't unlock the mutex again, leading
      to the runtime warning "QMutex: destroying locked mutex"
      * But if we add "else data.mutex.unlock()" then we risk that the other thread also
      calls unlock(), on a now-unlocked mutex, which is undefined behaviour.
      
      QWaitCondition is the right tool for waiting for something to happen,
      allowing us to unlock the mutex correctly in all cases.
      
      Test Plan: Alt+F2 "define test". Doesn't seem to work very reliably yet, though.
      
      Reviewers: #plasma, mart
      
      Subscribers: plasma-devel
      
      Tags: #plasma
      
      Differential Revision: https://phabricator.kde.org/D8320
      02d8fbfb
    • Script Kiddy's avatar
      SVN_SILENT made messages (.desktop file) - always resolve ours · 11b4a56b
      Script Kiddy authored
      In case of conflict in i18n, keep the version of the branch "ours"
      To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
      11b4a56b
  3. 18 Oct, 2017 1 commit
  4. 17 Oct, 2017 1 commit
  5. 13 Oct, 2017 1 commit
  6. 05 Oct, 2017 2 commits
  7. 28 Sep, 2017 1 commit
  8. 16 Sep, 2017 1 commit
  9. 13 Sep, 2017 2 commits
  10. 09 Sep, 2017 1 commit
  11. 04 Sep, 2017 1 commit
  12. 01 Sep, 2017 2 commits
  13. 27 Aug, 2017 1 commit
  14. 26 Aug, 2017 1 commit
  15. 24 Aug, 2017 1 commit
  16. 23 Aug, 2017 1 commit
  17. 21 Aug, 2017 1 commit
  18. 20 Aug, 2017 1 commit
  19. 19 Aug, 2017 1 commit
  20. 18 Aug, 2017 2 commits
  21. 17 Aug, 2017 1 commit
  22. 14 Aug, 2017 1 commit
  23. 11 Aug, 2017 1 commit
  24. 10 Aug, 2017 1 commit
  25. 08 Aug, 2017 1 commit
  26. 30 Jul, 2017 1 commit
  27. 29 Jul, 2017 1 commit
  28. 28 Jul, 2017 2 commits
  29. 26 Jul, 2017 1 commit
  30. 18 Jul, 2017 1 commit
  31. 17 Jul, 2017 2 commits
  32. 12 Jul, 2017 1 commit