diff --git a/src/gui/mainwidget.cpp b/src/gui/mainwidget.cpp index e65430a..37b9d06 100644 --- a/src/gui/mainwidget.cpp +++ b/src/gui/mainwidget.cpp @@ -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); } diff --git a/src/indicator/qtrayicon.h b/src/indicator/qtrayicon.h index f90a40a..ea31229 100644 --- a/src/indicator/qtrayicon.h +++ b/src/indicator/qtrayicon.h @@ -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; diff --git a/src/indicator/trayindicator_global.h b/src/indicator/trayindicator_global.h index 1ce7e5d..3033fc6 100644 --- a/src/indicator/trayindicator_global.h +++ b/src/indicator/trayindicator_global.h @@ -22,10 +22,14 @@ #include +#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