summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 6771a66..693e77f 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -35,15 +35,13 @@
#include <qpe/password.h>
#include <qpe/config.h>
#include <qpe/power.h>
#include <qpe/timeconversion.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/global.h>
-#ifdef QT_QWS_CUSTOM
-#include "qpe/custom.h"
-#endif
+#include <qpe/custom.h>
#include <qgfx_qws.h>
#include <qmainwindow.h>
#include <qmessagebox.h>
#include <qtimer.h>
#include <qwindowsystem_qws.h>
@@ -766,13 +764,13 @@ void Desktop::screenClick()
#endif
}
void Desktop::soundAlarm()
{
#ifdef CUSTOM_SOUND_ALARM
- if (alarmsound)
+ if (qpedesktop->alarmsound)
CUSTOM_SOUND_ALARM;
#endif
}
bool Desktop::eventFilter( QObject *w, QEvent *ev )
{