More windows fixes

src/mainwindow.cpp

@@ -227,8 +227,8 @@ MainWindow::MainWindow(QWidget *parent)
   connect(tray_icon_, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), SLOT(TrayClicked(QSystemTrayIcon::ActivationReason)));
 
   // Global shortcuts
-  // Breaks on OS X.
-#ifndef Q_OS_DARWIN
+  // Breaks on OS X and Windows
+#ifdef Q_OS_LINUX
   QxtGlobalShortcut* play_pause = new QxtGlobalShortcut(QKeySequence("Media Play"), this);
   QxtGlobalShortcut* stop = new QxtGlobalShortcut(QKeySequence("Media Stop"), this);
   QxtGlobalShortcut* next = new QxtGlobalShortcut(QKeySequence("Media Next"), this);

src/osd_win.cpp

@@ -0,0 +1,15 @@
+#include "osd.h"
+
+#include <QtDebug>
+
+void OSD::Init() {
+}
+
+bool OSD::CanShowNativeMessages() const {
+  return false;
+}
+
+void OSD::ShowMessageNative(const QString&, const QString&,
+                            const QString&) {
+}
+

src/src.pro

@@ -127,7 +127,11 @@ LIBS += -llastfm
 !win32 { 
     mac { 
         QMAKE_CXXFLAGS += -I/usr/local/include
-        LIBS += -L/usr/local/lib -ltag -llastfm -lxine -framework Carbon
+        LIBS += -L/usr/local/lib \
+            -ltag \
+            -lxine \
+            -framework \
+            Carbon
     }
     !mac { 
         QMAKE_CXXFLAGS += $$system(taglib-config --cflags)
@@ -138,28 +142,25 @@ LIBS += -llastfm
         LIBS += $$system(pkg-config --libs libnotify)
     }
 }
-win32 { 
-    INCLUDEPATH += C:/msys/1.0/local/include \
-        C:/msys/1.0/local/include/taglib
-    LIBS += -Lc:/msys/1.0/local/lib \
-        -Lc:/msys/1.0/local/bin \
-        -ltag \
+win32:LIBS += -ltag \
     -lxine \
     -lpthreadGC2
-}
 unix:!macx:SOURCES += osd_x11.cpp
 macx:SOURCES += osd_mac.cpp
+win32:SOURCES += osd_win.cpp
 
 # QXT
 INCLUDEPATH += ../3rdparty/qxt
-HEADERS += ../3rdparty/qxt/qxtglobalshortcut.h
-HEADERS += ../3rdparty/qxt/qxtglobalshortcut_p.h
-HEADERS += ../3rdparty/qxt/qxtglobal.h
-SOURCES += ../3rdparty/qxt/qxtglobalshortcut.cpp
-SOURCES += ../3rdparty/qxt/qxtglobal.cpp
-unix:!macx:SOURCES += ../3rdparty/qxt/qxtglobalshortcut_x11.cpp
-macx:SOURCES += ../3rdparty/qxt/qxtglobalshortcut_mac.cpp
-win32:SOURCES += ../3rdparty/qxt/qxtglobalshortcut_win.cpp
+unix:!macx: {
+    HEADERS += ../3rdparty/qxt/qxtglobalshortcut.h
+    HEADERS += ../3rdparty/qxt/qxtglobalshortcut_p.h
+    HEADERS += ../3rdparty/qxt/qxtglobal.h
+    SOURCES += ../3rdparty/qxt/qxtglobalshortcut.cpp
+    SOURCES += ../3rdparty/qxt/qxtglobal.cpp
+    unix:!macx:SOURCES += ../3rdparty/qxt/qxtglobalshortcut_x11.cpp
+    macx:SOURCES += ../3rdparty/qxt/qxtglobalshortcut_mac.cpp
+    win32:SOURCES += ../3rdparty/qxt/qxtglobalshortcut_win.cpp
+}
 
 # QtSingleApplication
 INCLUDEPATH += ../3rdparty/qtsingleapplication

src/xine-engine.cpp

@@ -118,7 +118,7 @@ XineEngine::init()
   qDebug() << "'Bringing joy to small mexican gerbils, a few weeks at a time.'";
 
 #ifdef Q_OS_WIN32
-  setenv("XINE_PLUGIN_PATH", QString(QCoreApplication::applicationDirPath() + "/xine/plugins").toAscii().constData(), 1);
+  putenv(QString("XINE_PLUGIN_PATH" + QCoreApplication::applicationDirPath() + "/xine/plugins").toAscii().constData());
 #endif  // Q_OS_WIN32
 
 #ifdef Q_OS_DARWIN