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 /core/launcher/taskbar.cpp | |
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/taskbar.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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 | |||
@@ -29,19 +29,16 @@ | |||
29 | #include "taskbar.h" | 29 | #include "taskbar.h" |
30 | #include "desktop.h" | 30 | #include "desktop.h" |
31 | 31 | ||
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> |
45 | #include <qtimer.h> | 42 | #include <qtimer.h> |
46 | #include <qwindowsystem_qws.h> | 43 | #include <qwindowsystem_qws.h> |
47 | #include <qwidgetstack.h> | 44 | #include <qwidgetstack.h> |