Fix windows compilation
This commit is contained in:
@@ -215,7 +215,7 @@ void MainWidget::refreshDatabase()
|
||||
TrayIndicator *MainWidget::createTrayObject(QWidget *parent)
|
||||
{
|
||||
TrayFunctionPointer create_tray = NULL;
|
||||
|
||||
#ifdef Q_OS_LINUX
|
||||
QString desktop = getenv("XDG_CURRENT_DESKTOP");
|
||||
qDebug() << "Current desktop: " << desktop;
|
||||
|
||||
@@ -241,7 +241,7 @@ TrayIndicator *MainWidget::createTrayObject(QWidget *parent)
|
||||
else
|
||||
qDebug() << "Cannot load libqcma_appindicator plugin";
|
||||
}
|
||||
|
||||
#endif
|
||||
// else QSystemTrayIcon
|
||||
return (create_tray != NULL) ? create_tray(parent) : createTrayIndicator(parent);
|
||||
}
|
||||
|
@@ -38,10 +38,6 @@ public:
|
||||
void hide();
|
||||
void showMessage(const QString &title, const QString &message);
|
||||
|
||||
#ifndef Q_OS_LINUX
|
||||
void showMessage(const QString &title, const QString &message);
|
||||
#endif
|
||||
|
||||
private:
|
||||
//system tray
|
||||
QAction *quit;
|
||||
|
@@ -22,10 +22,14 @@
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
#ifdef Q_OS_LINUX
|
||||
#if defined(QCMA_TRAYINDICATOR_LIBRARY)
|
||||
# define TRAYINDICATORSHARED_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
# define TRAYINDICATORSHARED_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
#else
|
||||
# define TRAYINDICATORSHARED_EXPORT
|
||||
#endif
|
||||
|
||||
#endif // TRAYINDICATOR_GLOBAL_H
|
||||
|
Reference in New Issue
Block a user