summaryrefslogtreecommitdiffstats
path: root/examples/widgets/desktop
diff options
context:
space:
mode:
authorMontel Laurent <laurent.montel@kdab.com>2012-12-06 14:54:01 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-06 18:40:29 +0100
commit51e7aeb29bc804b904656083d4317c8239c6f8b0 (patch)
treed16765bfadac4ae2d5db56294bef3ad04bd3e24e /examples/widgets/desktop
parentce556dfcbc9eeb8d993fa8ce9c9fac6cfb71d2be (diff)
Fix compile with -DQT_NO_SYSTEMTRAYICON
Change-Id: Icca0bef7efca77a841b30f40692144663e7ae913 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'examples/widgets/desktop')
-rw-r--r--examples/widgets/desktop/systray/main.cpp25
-rw-r--r--examples/widgets/desktop/systray/window.cpp5
-rw-r--r--examples/widgets/desktop/systray/window.h5
3 files changed, 34 insertions, 1 deletions
diff --git a/examples/widgets/desktop/systray/main.cpp b/examples/widgets/desktop/systray/main.cpp
index bb81bb78e4..ece04524b8 100644
--- a/examples/widgets/desktop/systray/main.cpp
+++ b/examples/widgets/desktop/systray/main.cpp
@@ -39,8 +39,10 @@
****************************************************************************/
#include <QApplication>
-#include <QMessageBox>
+#ifndef QT_NO_SYSTEMTRAYICON
+
+#include <QMessageBox>
#include "window.h"
int main(int argc, char *argv[])
@@ -61,3 +63,24 @@ int main(int argc, char *argv[])
window.show();
return app.exec();
}
+
+#else
+
+#include <QLabel>
+#include <QDebug>
+
+int main(int argc, char *argv[])
+{
+ QApplication app(argc, argv);
+ QString text("QSystemTrayIcon is not supported on this platform");
+
+ QLabel *label = new QLabel(text);
+ label->setWordWrap(true);
+
+ label->show();
+ qDebug() << text;
+
+ app.exec();
+}
+
+#endif
diff --git a/examples/widgets/desktop/systray/window.cpp b/examples/widgets/desktop/systray/window.cpp
index 8de1f5843e..a7ea3b471e 100644
--- a/examples/widgets/desktop/systray/window.cpp
+++ b/examples/widgets/desktop/systray/window.cpp
@@ -39,6 +39,9 @@
****************************************************************************/
#include "window.h"
+
+#ifndef QT_NO_SYSTEMTRAYICON
+
#include <QtGui>
#include <QAction>
@@ -265,3 +268,5 @@ void Window::createTrayIcon()
trayIcon = new QSystemTrayIcon(this);
trayIcon->setContextMenu(trayIconMenu);
}
+
+#endif
diff --git a/examples/widgets/desktop/systray/window.h b/examples/widgets/desktop/systray/window.h
index 2c33812778..08919e8a49 100644
--- a/examples/widgets/desktop/systray/window.h
+++ b/examples/widgets/desktop/systray/window.h
@@ -42,6 +42,9 @@
#define WINDOW_H
#include <QSystemTrayIcon>
+
+#ifndef QT_NO_SYSTEMTRAYICON
+
#include <QDialog>
QT_BEGIN_NAMESPACE
@@ -109,4 +112,6 @@ private:
};
//! [0]
+#endif // QT_NO_SYSTEMTRAYICON
+
#endif