jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 08:14:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

merged master

Browse source
This commit is contained in:
Fabio Bas 2015-09-13 19:39:42 +02:00
commit a6bc709583
31 changed files with 376 additions and 442 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/main.cpp
View file

@ -26,7 +26,6 @@
#include <QTranslator>
#include <QLibraryInfo>
#include <QDateTime>
#include <QIcon>
#include <QDir>
#include <QDesktopServices>
#include <QDebug>
@ -207,8 +206,7 @@ int main(int argc, char *argv[])
MainWindow ui;
qDebug("main(): MainWindow constructor finished");
QIcon icon("theme:cockatrice.svg");
ui.setWindowIcon(icon);
ui.setWindowIcon(QPixmap("theme:cockatrice"));
settingsCache->setClientID(generateClientID());