From 20396d636a3ad30bac5b3a0d70ce1a8a92b88683 Mon Sep 17 00:00:00 2001 From: Keith Isdale Date: Fri, 2 Jul 2010 11:37:08 +1000 Subject: Support "maemo" in checkOS() function The qmake code to check if Maemo is the target hopefully will not be required for some future version of Qt --- libqtslave/libqtslave.pro | 5 +++++ libqtslave/qtestslave.cpp | 3 +++ 2 files changed, 8 insertions(+) diff --git a/libqtslave/libqtslave.pro b/libqtslave/libqtslave.pro index 5dfd285..d9cd73d 100644 --- a/libqtslave/libqtslave.pro +++ b/libqtslave/libqtslave.pro @@ -25,6 +25,11 @@ unix:!symbian { INSTALLS+=target } +linux-g++-maemo*:{ + message(Maemo platform detected enabling define Q_OS_MAEMO) + DEFINES += Q_OS_MAEMO +} + symbian { TARGET.EPOCALLOWDLLDATA=1 TARGET.CAPABILITY += AllFiles ReadDeviceData ReadUserData SwEvent WriteUserData NetworkServices diff --git a/libqtslave/qtestslave.cpp b/libqtslave/qtestslave.cpp index 502d398..81e984b 100644 --- a/libqtslave/qtestslave.cpp +++ b/libqtslave/qtestslave.cpp @@ -1676,6 +1676,9 @@ QTestMessage QTestSlavePrivate::checkOS( QTestMessage const &message ) #ifdef Q_OS_LINUX if (os == "LINUX") result = true; #endif +#ifdef Q_OS_MAEMO + if (os == "MAEMO") result = true; +#endif #ifdef Q_OS_MAC if (os == "MAC") result = true; #endif -- cgit v1.2.3