From d69039cb83e7cf941be43b526ec46f8de0b47160 Mon Sep 17 00:00:00 2001 From: Sean Date: Wed, 26 Nov 2014 08:31:03 -0800 Subject: [PATCH 1/3] Lemmie fix those for you --- src/platform.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/platform.cpp b/src/platform.cpp index b514ede29..cbdd79240 100644 --- a/src/platform.cpp +++ b/src/platform.cpp @@ -1,8 +1,8 @@ #include "platform.h" #include -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN32) #include -#elif defined(Q_OS_DARWIN) && defined(HAVE_IOKIT) +#elif defined(__APPLE__) && defined(__MACH__) #include #include #else // Q_OS_UNIX @@ -17,11 +17,11 @@ u_int32_t Platform::getIdleTime() // https://hg.pidgin.im/pidgin/main/file/13e4ae613a6a/pidgin/gtkidle.c u_int32_t idleTime = 0; -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN32) LASTINPUTINFO info = { 0 }; if(GetLastInputInfo(&info)) idleTime = info.dwTime / 1000; -#elif defined(Q_OS_DARWIN) && defined(HAVE_IOKIT) +#elif defined(__APPLE__) && defined(__MACH__) static io_service_t service = NULL; CFTypeRef property; u_int64_t idleTime_ns = 0; From fb375cd07e3d2088333eb05f717f7035747c5def Mon Sep 17 00:00:00 2001 From: Sean Date: Wed, 26 Nov 2014 08:43:02 -0800 Subject: [PATCH 2/3] Link against IOKit --- qtox.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtox.pro b/qtox.pro index e32a95ac8..5c0e796d4 100644 --- a/qtox.pro +++ b/qtox.pro @@ -70,7 +70,7 @@ win32 { BUNDLEID = im.tox.qtox ICON = img/icons/qtox.icns QMAKE_INFO_PLIST = osx/info.plist - LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns -lsodium -lvpx -framework OpenAL -lopencv_core -lopencv_highgui + LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns -lsodium -lvpx -framework OpenAL -framework IOKit -lopencv_core -lopencv_highgui } else { # If we're building a package, static link libtox[core,av] and libsodium, since they are not provided by any package contains(STATICPKG, YES) { From 985c25f77ec362cc34edcdc0f9d6aa405938a45a Mon Sep 17 00:00:00 2001 From: Sean Date: Wed, 26 Nov 2014 08:52:07 -0800 Subject: [PATCH 3/3] Can't forget CoreFoundation --- qtox.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtox.pro b/qtox.pro index 5c0e796d4..d06ce4603 100644 --- a/qtox.pro +++ b/qtox.pro @@ -70,7 +70,7 @@ win32 { BUNDLEID = im.tox.qtox ICON = img/icons/qtox.icns QMAKE_INFO_PLIST = osx/info.plist - LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns -lsodium -lvpx -framework OpenAL -framework IOKit -lopencv_core -lopencv_highgui + LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns -lsodium -lvpx -framework OpenAL -framework IOKit -lopencv_core -lopencv_highgui -framework CoreFoundation } else { # If we're building a package, static link libtox[core,av] and libsodium, since they are not provided by any package contains(STATICPKG, YES) {