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

Merge branch 'master' into cmake_qt5

Browse source 
Conflicts:
	cockatrice/src/main.cpp
This commit is contained in:
Daenyth 2014-06-28 09:13:10 -04:00
commit 09d6d26fb2
22 changed files with 156 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/main.cpp
View file

@ -56,7 +56,7 @@ QString translationPath = QString();
#endif
#if QT_VERSION < 0x050000
void myMessageOutput(QtMsgType /*type*/, const char *msg)
static void myMessageOutput(QtMsgType /*type*/, const char *msg)
{
QFile file("qdebug.txt");
file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text);
@ -65,7 +65,7 @@ void myMessageOutput(QtMsgType /*type*/, const char *msg)
file.close();
}
#else
void myMessageOutput(QtMsgType /*type*/, const QMessageLogContext &, const QString &msg)
static void myMessageOutput(QtMsgType /*type*/, const QMessageLogContext &, const QString &msg)
{
QFile file("qdebug.txt");
file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text);