2 files changed, 4 insertions, 4 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 8eaea17..64fb968 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -104,3 +104,3 @@ int initApplication( int argc, char ** argv )
 
-#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
+    if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
     if ( !QFile::exists( "/etc/pointercal" ) ) {
@@ -111,3 +111,3 @@ int initApplication( int argc, char ** argv )
     }
-#endif
+    }
 
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 1800be0..9c40fc4 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -325,3 +325,3 @@ int login_main ( int argc, char **argv, pid_t ppid )
 
-#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
+        if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
         if ( !QFile::exists ( "/etc/pointercal" )) {
@@ -332,3 +332,3 @@ int login_main ( int argc, char **argv, pid_t ppid )
         }
-#endif
+        }