summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2010-07-02 11:37:08 +1000
committerKeith Isdale <keith.isdale@nokia.com>2010-07-02 11:37:08 +1000
commit20396d636a3ad30bac5b3a0d70ce1a8a92b88683 (patch)
treeceea4e22761b6dde8ed90119653dbaf869db200b
parentc7fbbc456fc1f71fd312ed9022322d0e54457222 (diff)
Support "maemo" in checkOS() functionstable
The qmake code to check if Maemo is the target hopefully will not be required for some future version of Qt
-rw-r--r--libqtslave/libqtslave.pro5
-rw-r--r--libqtslave/qtestslave.cpp3
2 files changed, 8 insertions, 0 deletions
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