| author | sandman <sandman> | 2002-06-13 15:09:47 (UTC) |
|---|---|---|
| committer | sandman <sandman> | 2002-06-13 15:09:47 (UTC) |
| commit | 0d66b6176567eceda8dc5880a292df19386c7f78 (patch) (side-by-side diff) | |
| tree | 63e4ed13d59c3972e6731fdf604f1cdbe14b5922 /core | |
| parent | 1b5c103ca47a091c37c084133c3b26b8d6e04db5 (diff) | |
| download | opie-0d66b6176567eceda8dc5880a292df19386c7f78.zip opie-0d66b6176567eceda8dc5880a292df19386c7f78.tar.gz opie-0d66b6176567eceda8dc5880a292df19386c7f78.tar.bz2 | |
Fix for ljp's fix for my fix of custom.h handling on iPAQs
Should now work for iPAQ, Z and x86
| -rw-r--r-- | core/launcher/desktop.cpp | 2 | ||||
| -rw-r--r-- | core/launcher/main.cpp | 2 | ||||
| -rw-r--r-- | core/launcher/taskbar.cpp | 7 | ||||
| -rw-r--r-- | core/launcher/taskbar.h | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 974de0c..aa51898 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp @@ -39,7 +39,7 @@ #include <qpe/qcopenvelope_qws.h> #include <qpe/global.h> -#ifdef QT_QWS_CUSTOM +#if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) #include <qpe/custom.h> #endif diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 12c2a7c..fc6d829 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -25,7 +25,7 @@ #include <qpe/qpeapplication.h> #include <qpe/network.h> #include <qpe/config.h> -#ifdef QT_QWS_CUSTOM +#if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) #include <qpe/custom.h> #endif diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index bff2a1c..5e95c99 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp @@ -32,13 +32,10 @@ #include <qpe/qpeapplication.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/global.h> -#ifdef QT_QWS_CUSTOM + +#if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) #include <qpe/custom.h> #endif -#if defined(QT_QWS_IPAQ) -#include "qpe/custom-ipaq.h" -#endif - #include <qlabel.h> #include <qlayout.h> diff --git a/core/launcher/taskbar.h b/core/launcher/taskbar.h index cdeb3c7..78c4722 100644 --- a/core/launcher/taskbar.h +++ b/core/launcher/taskbar.h @@ -21,7 +21,7 @@ #ifndef __TASKBAR_H__ #define __TASKBAR_H__ -#ifdef QT_QWS_CUSTOM +#if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) #include <qpe/custom.h> #endif |