| author | sandman <sandman> | 2002-06-13 15:09:47 (UTC) |
|---|---|---|
| committer | sandman <sandman> | 2002-06-13 15:09:47 (UTC) |
| commit | 0d66b6176567eceda8dc5880a292df19386c7f78 (patch) (unidiff) | |
| tree | 63e4ed13d59c3972e6731fdf604f1cdbe14b5922 | |
| 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 @@ | |||
| 39 | #include <qpe/qcopenvelope_qws.h> | 39 | #include <qpe/qcopenvelope_qws.h> |
| 40 | #include <qpe/global.h> | 40 | #include <qpe/global.h> |
| 41 | 41 | ||
| 42 | #ifdef QT_QWS_CUSTOM | 42 | #if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) |
| 43 | #include <qpe/custom.h> | 43 | #include <qpe/custom.h> |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
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 @@ | |||
| 25 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
| 26 | #include <qpe/network.h> | 26 | #include <qpe/network.h> |
| 27 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
| 28 | #ifdef QT_QWS_CUSTOM | 28 | #if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) |
| 29 | #include <qpe/custom.h> | 29 | #include <qpe/custom.h> |
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
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 @@ | |||
| 32 | #include <qpe/qpeapplication.h> | 32 | #include <qpe/qpeapplication.h> |
| 33 | #include <qpe/qcopenvelope_qws.h> | 33 | #include <qpe/qcopenvelope_qws.h> |
| 34 | #include <qpe/global.h> | 34 | #include <qpe/global.h> |
| 35 | #ifdef QT_QWS_CUSTOM | 35 | |
| 36 | #if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) | ||
| 36 | #include <qpe/custom.h> | 37 | #include <qpe/custom.h> |
| 37 | #endif | 38 | #endif |
| 38 | #if defined(QT_QWS_IPAQ) | ||
| 39 | #include "qpe/custom-ipaq.h" | ||
| 40 | #endif | ||
| 41 | |||
| 42 | 39 | ||
| 43 | #include <qlabel.h> | 40 | #include <qlabel.h> |
| 44 | #include <qlayout.h> | 41 | #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 @@ | |||
| 21 | #ifndef __TASKBAR_H__ | 21 | #ifndef __TASKBAR_H__ |
| 22 | #define __TASKBAR_H__ | 22 | #define __TASKBAR_H__ |
| 23 | 23 | ||
| 24 | #ifdef QT_QWS_CUSTOM | 24 | #if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) |
| 25 | #include <qpe/custom.h> | 25 | #include <qpe/custom.h> |
| 26 | #endif | 26 | #endif |
| 27 | 27 | ||