Fix windows compilation

This commit is contained in:
codestation
2014-10-07 16:58:52 -04:30
parent 8d271a4def
commit 4f7d3ce280
3 changed files with 6 additions and 6 deletions

View File

@@ -215,7 +215,7 @@ void MainWidget::refreshDatabase()
TrayIndicator *MainWidget::createTrayObject(QWidget *parent) TrayIndicator *MainWidget::createTrayObject(QWidget *parent)
{ {
TrayFunctionPointer create_tray = NULL; TrayFunctionPointer create_tray = NULL;
#ifdef Q_OS_LINUX
QString desktop = getenv("XDG_CURRENT_DESKTOP"); QString desktop = getenv("XDG_CURRENT_DESKTOP");
qDebug() << "Current desktop: " << desktop; qDebug() << "Current desktop: " << desktop;
@@ -241,7 +241,7 @@ TrayIndicator *MainWidget::createTrayObject(QWidget *parent)
else else
qDebug() << "Cannot load libqcma_appindicator plugin"; qDebug() << "Cannot load libqcma_appindicator plugin";
} }
#endif
// else QSystemTrayIcon // else QSystemTrayIcon
return (create_tray != NULL) ? create_tray(parent) : createTrayIndicator(parent); return (create_tray != NULL) ? create_tray(parent) : createTrayIndicator(parent);
} }

View File

@@ -38,10 +38,6 @@ public:
void hide(); void hide();
void showMessage(const QString &title, const QString &message); void showMessage(const QString &title, const QString &message);
#ifndef Q_OS_LINUX
void showMessage(const QString &title, const QString &message);
#endif
private: private:
//system tray //system tray
QAction *quit; QAction *quit;

View File

@@ -22,10 +22,14 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#ifdef Q_OS_LINUX
#if defined(QCMA_TRAYINDICATOR_LIBRARY) #if defined(QCMA_TRAYINDICATOR_LIBRARY)
# define TRAYINDICATORSHARED_EXPORT Q_DECL_EXPORT # define TRAYINDICATORSHARED_EXPORT Q_DECL_EXPORT
#else #else
# define TRAYINDICATORSHARED_EXPORT Q_DECL_IMPORT # define TRAYINDICATORSHARED_EXPORT Q_DECL_IMPORT
#endif #endif
#else
# define TRAYINDICATORSHARED_EXPORT
#endif
#endif // TRAYINDICATOR_GLOBAL_H #endif // TRAYINDICATOR_GLOBAL_H