bugfixes official db inclusion / former cherry-pick conflict solution corrected

2016-10-25 22:02:46 +02:00
parent a4843369ee
commit 6ae765baac
2 changed files with 42 additions and 8 deletions
@@ -5,12 +5,6 @@ SUBDIRS = pokerth_protocol.pro pokerth_db.pro pokerth_lib.pro
 official_server {
    SUBDIRS += pokerth_dbofficial.pro
 }
-qml-client{
-    SUBDIRS += pokerth_qml-client.pro
-}
-!qml-client{
-    SUBDIRS += pokerth_game.pro
-}
 !mac:!gui_800x480:!client:!qml-client {
 	SUBDIRS += pokerth_server.pro chatcleaner.pro
 }