chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better QT Version check in previous code

Browse Source
This commit is contained in:
Mark Watkins 2011-11-16 08:08:48 +10:00
parent 231e8749c6
commit 7f5324e3f6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common_gui.cpp
View File

@ -1,7 +1,14 @@
#include "common_gui.h" #include "common_gui.h"
#include "qglobal.h" #include "qglobal.h"
#if QT_VERSION<0x400800 #if (QT_VERSION >= QT_VERSION_CHECK(4,8,0))
// Qt 4.8 makes this a whole lot easier
Qt::DayOfWeek firstDayOfWeekFromLocale()
{
return QLocale::system().firstDayOfWeek();
}
#else
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#endif #endif
@ -45,12 +52,5 @@ Qt::DayOfWeek firstDayOfWeekFromLocale()
return firstDay; return firstDay;
} }
#else
// Qt 4.8 makes this a whole lot easier
Qt::DayOfWeek firstDayOfWeekFromLocale()
{
return QLocale::system().firstDayOfWeek();
}
#endif #endif