summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-11 13:26:52 (UTC)
committer llornkcor <llornkcor>2002-06-11 13:26:52 (UTC)
commitd7be88ed0355e32f15da6ecbf56f2d825c530d2a (patch) (unidiff)
treeb8badca1426dd9128126b1af620541c89bb14d42
parente9b7ffa394fa30bea063fbed68b36800e9ebee6d (diff)
downloadopie-d7be88ed0355e32f15da6ecbf56f2d825c530d2a.zip
opie-d7be88ed0355e32f15da6ecbf56f2d825c530d2a.tar.gz
opie-d7be88ed0355e32f15da6ecbf56f2d825c530d2a.tar.bz2
follow up to the follow up for custom.h related things
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp3
-rw-r--r--core/launcher/taskbar.cpp6
2 files changed, 6 insertions, 3 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 693e77f..974de0c 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -35,13 +35,16 @@
35#include <qpe/password.h> 35#include <qpe/password.h>
36#include <qpe/config.h> 36#include <qpe/config.h>
37#include <qpe/power.h> 37#include <qpe/power.h>
38#include <qpe/timeconversion.h> 38#include <qpe/timeconversion.h>
39#include <qpe/qcopenvelope_qws.h> 39#include <qpe/qcopenvelope_qws.h>
40#include <qpe/global.h> 40#include <qpe/global.h>
41
42#ifdef QT_QWS_CUSTOM
41#include <qpe/custom.h> 43#include <qpe/custom.h>
44#endif
42 45
43#include <qgfx_qws.h> 46#include <qgfx_qws.h>
44#include <qmainwindow.h> 47#include <qmainwindow.h>
45#include <qmessagebox.h> 48#include <qmessagebox.h>
46#include <qtimer.h> 49#include <qtimer.h>
47#include <qwindowsystem_qws.h> 50#include <qwindowsystem_qws.h>
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index b69d165..bff2a1c 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -29,15 +29,15 @@
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#ifdef QT_QWS_CUSTOM
36//#include <qpe/custom.h> 36#include <qpe/custom.h>
37//#endif 37#endif
38#if defined(QT_QWS_IPAQ) 38#if defined(QT_QWS_IPAQ)
39#include "qpe/custom-ipaq.h" 39#include "qpe/custom-ipaq.h"
40#endif 40#endif
41 41
42 42
43#include <qlabel.h> 43#include <qlabel.h>