rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

try to fix gui compile error on mac 10.6 and 10.5

This commit is contained in:
jerry 2014-05-06 13:00:08 +00:00
parent b2f48a0f5b
commit 6df7ba2fc4
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/src/AXDatabaseCleaner.h
View File

@ -17,6 +17,13 @@
#pragma once #pragma once
#include <QtCore>
// HACK: ideally this file should not be included in project,
// if it is below marvericks, but it seems that .pro can't
// specify mac version
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
class AXDatabaseCleaner { class AXDatabaseCleaner {
public: public:
AXDatabaseCleaner(); AXDatabaseCleaner();
@ -31,3 +38,5 @@ private:
Private* m_private; Private* m_private;
bool m_waitForResponse; bool m_waitForResponse;
}; };
#endif

5
src/gui/src/AXDatabaseCleaner.mm
View File

@ -16,6 +16,9 @@
*/ */
#import "AXDatabaseCleaner.h" #import "AXDatabaseCleaner.h"
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
#import <ServiceManagement/ServiceManagement.h> #import <ServiceManagement/ServiceManagement.h>
@ -159,3 +162,5 @@ bool AXDatabaseCleaner::privilegeCommand(const char* command)
return true; return true;
} }
#endif

4
src/gui/src/main.cpp
View File

@ -31,9 +31,13 @@
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
#include "AXDatabaseCleaner.h" #include "AXDatabaseCleaner.h"
#endif #endif
#endif
class QThreadImpl : public QThread class QThreadImpl : public QThread
{ {
public: public: