Fix compile with -DQT_NO_SYSTEMTRAYICON

Change-Id: Icca0bef7efca77a841b30f40692144663e7ae913
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Montel Laurent 2012-12-06 14:54:01 +01:00 committed by The Qt Project
parent ce556dfcbc
commit 51e7aeb29b
3 changed files with 34 additions and 1 deletions

View File

@ -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

View File

@ -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

View File

@ -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