[Kde-games-devel] Review Request 127798: Merge branch 'master' into frameworks

[Martin Walch]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/127798/
-----------------------------------------------------------

Review request for KDE Games.


Repository: lskat


Description
-------

The master branch and the frameworks branch have diverged quite a lot in terms of diff size.

This merges the changes from master into frameworks.

There were a lot of conflicts. Hopefully I got them all right.


Diffs
-----

  README d6131309dfd7d2dc6bd60dad15c089d51c6184c0 
  grafix/blue.desktop 4562da0fcd008ce0b9a3b9bf8721a7eb9f2e1197 
  grafix/oxygen.desktop f27d688e643fbb6c3777a8c3a8f3566a9d04a16a 
  lskat.lsm bd90d94eb9a38625ee9de2c5bd5c95ccec4c29a6 
  src/CMakeLists.txt fa57894bac06fc447c27fb113890c26f723c1fff 
  src/abstractdisplay.h 34ac418030a79fbd89d992e7199812370ad4cd18 
  src/abstractdisplay.cpp b41f07eed9132e5a2fe26d268e93453088d0c5ef 
  src/abstractengine.h 6afd3aebe3ad114fc5b268fecb0cc486f414cd09 
  src/abstractengine.cpp f41117b8b796ef9d3226f4eccf876408314cd5ec 
  src/abstractinput.h 501a8934a6165c6726ad746d751deee1726a1d46 
  src/abstractinput.cpp c38f3aa6dcdb84c7de1cbfeff2326725e29c284a 
  src/aiinput.h edaee483c23c5eb9ae4fe330e6558edc8e073c83 
  src/aiinput.cpp a885e0067969fe2c671b2c1d9a64fe1091c8b4a8 
  src/cardsprite.h 074fab9abbbaf7312f916b7606e052753b4d2514 
  src/cardsprite.cpp 94bdd4946c0f5ffcfe764b9bc86bb94c9449b1cf 
  src/config-src.h.cmake 2375fd30d6de1ab735a4c1ad94774ccf403d7339 
  src/config_two.h 0ca5132491f1b49306d957cc1456d4304e84caea 
  src/config_two.cpp f8a2a376d2802ef5a6cccd0ead7df8f80e8d76cd 
  src/deck.h 8bd9b4dfe552f14b00c43c20a7ae292fefab0975 
  src/deck.cpp 05e0bde17867b8a3dbf8a7f21d03e08066f002e8 
  src/display_intro.h 46f0a631ae399bddd12c7696619b930fee5dae67 
  src/display_intro.cpp 346b183bf3ff04b055dd5691a065f0b276076cf6 
  src/display_two.h 26cf2a3eea5253d1802c05d3c0d654249591dca3 
  src/display_two.cpp 0e1cb9061750db94592acadff451dc9b17800f8f 
  src/engine_two.h 0afedbf7b2265f23722c984fdb939ca921df9fd1 
  src/engine_two.cpp a272ce4e8a8adaf8092c2e5655511c45ecac9b5a 
  src/fromlibkdegames/cardcache.h e1f9b9dc79f1c8704ea812d7adfb8bb8bb5a420b 
  src/fromlibkdegames/cardcache.cpp 97104becc4c5fe7dcbe81a646c29fadf9c60fd85 
  src/fromlibkdegames/cardcache_p.h effd6180c5104af6276e6e8e84e43dfac11b0be4 
  src/fromlibkdegames/carddeckinfo.h 57cd7b530e7192e9b016539b83098e491437da2d 
  src/fromlibkdegames/carddeckinfo.cpp bfd255648fa4557b122dfc79df70d009a1929ca5 
  src/fromlibkdegames/carddeckinfo_p.h b0e1f9f489ef7092628d7ebb8f26f808783ea882 
  src/fromlibkdegames/kcarddialog.h 155f6585b01014eb788a6f075d518032b297e014 
  src/fromlibkdegames/kcarddialog.cpp be20e968b7ae8003b9e4ba3d2885670c4545f522 
  src/gameview.h 764f094c7f44996de540122b273ddcaf0bf225c0 
  src/gameview.cpp c77d2efa4077b592dd199b7e65e03583a8035256 
  src/lskat_debug.h ec11ade004cd391b6f58a5758b79f1834130a321 
  src/lskat_debug.cpp c5225658ca3b43b5efa3ebfa23750c1288594cd8 
  src/lskatglobal.h 0c06da022a1053d1b55e7aa652cf1480a53676fc 
  src/lskatui.rc 4132ff86c4b823405ecbe903ed51d060a1fed7a9 
  src/main.cpp 4e0b60280fa82cb06dc0d53acb7f2328664129e4 
  src/mainwindow.h 2d82000a3640823ce5a9dcc38600769627b14e79 
  src/mainwindow.cpp 3f9ab57864ee6141aa771bc90784fd88e2f48008 
  src/mouseinput.h aff1668d0ce91bbfac9263ecb6dadddf6cad772e 
  src/mouseinput.cpp 153c13a6c418a5782d2b703997d50d6c58ddf9b6 
  src/namedialogwidget.h f8c803622d7ba7206f79e852e3c77aa564f7f510 
  src/namedialogwidget.cpp f16ebba87c6bed91ca903b20bf9eea539d16d31a 
  src/pixmapsprite.h ccd33541994393f0dea216fae58220209f9c6578 
  src/pixmapsprite.cpp 3371e21d0ad59b1ef380eb1a51d529de75db9726 
  src/player.h e1ff42251c8c9d6335c21f25cdd687112879884a 
  src/player.cpp 9a4e1f5ee0a8e9d2229cf326644a1fb402592b44 
  src/scoresprite.h d974e17d827713f545be6a6adedb6043c0d15d1a 
  src/scoresprite.cpp 31ee5d26ca63c27b0351198753b99482840747cd 
  src/textsprite.h 15cf431fd2aec239a31a9bc261900dd8a913afbd 
  src/textsprite.cpp cc750e8fffdf5dd592f1c0923144e3c27ddaf8cc 
  src/thememanager.h 6aff19055266a04f7ec2fc0aa2bc8019e0c7f4b3 
  src/thememanager.cpp c160005905499aa6c18aa6a3b1dfe69de714be4d 

Diff: https://git.reviewboard.kde.org/r/127798/diff/


Testing
-------

Compiled against KF 5.21.

Crashes for me at runtime when initializing KCrash (how ironic), but this also happens with the current state of frameworks before the merge.


Thanks,

Martin Walch

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-games-devel/attachments/20160430/71f4d646/attachment.html>