diff options
| -rw-r--r-- | qmmp.pri | 2 | ||||
| -rw-r--r-- | src/app/app.pro | 2 | ||||
| -rw-r--r-- | src/plugins/General/General.pro | 4 | ||||
| -rw-r--r-- | src/plugins/General/hotkey/hotkeymanager_win.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/General/trackchange/trackchange.pro | 4 | ||||
| -rw-r--r-- | src/plugins/Output/directsound/outputdirectsound.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/Output/directsound/outputdirectsound.h | 1 | ||||
| -rw-r--r-- | src/plugins/Output/directsound/outputdirectsoundfactory.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Output/waveout/outputwaveoutfactory.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Output/waveout/outputwaveoutfactory.h | 1 | ||||
| -rw-r--r-- | src/plugins/plugins.pri | 4 | ||||
| -rw-r--r-- | src/qmmpui/qmmpui.pro | 2 |
12 files changed, 13 insertions, 13 deletions
@@ -13,7 +13,7 @@ RCC_DIR=./.build/rcc #Defines DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS -DEFINES += QMMP_WS_X11 +unix:DEFINES += QMMP_WS_X11 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400 #Configuration diff --git a/src/app/app.pro b/src/app/app.pro index 9e9551591..9dae0ecfd 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -45,7 +45,7 @@ unix { } win32 { - LIBS += -lqmmp0 -lqmmpui0 + LIBS += -lqmmp1 -lqmmpui1 QMAKE_LIBDIR += ../../bin RC_FILE = qmmp.rc } diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro index 03727ba7d..022054166 100644 --- a/src/plugins/General/General.pro +++ b/src/plugins/General/General.pro @@ -8,13 +8,13 @@ SUBDIRS += statusicon \ covermanager \ streambrowser \ trackchange \ - hotkey \ copypaste \ rgscan unix:SUBDIRS += mpris \ kdenotify \ converter \ - gnomehotkey + gnomehotkey \ + hotkey contains(CONFIG, UDISKS2_PLUGIN){ unix:SUBDIRS += udisks2 diff --git a/src/plugins/General/hotkey/hotkeymanager_win.cpp b/src/plugins/General/hotkey/hotkeymanager_win.cpp index 44fdb6cb6..3edc818be 100644 --- a/src/plugins/General/hotkey/hotkeymanager_win.cpp +++ b/src/plugins/General/hotkey/hotkeymanager_win.cpp @@ -21,7 +21,6 @@ #include <QtGlobal>
#ifdef Q_OS_WIN
#include <QSettings>
-#include <QX11Info>
#include <QEvent>
#include <QKeyEvent>
#include <QCoreApplication>
diff --git a/src/plugins/General/trackchange/trackchange.pro b/src/plugins/General/trackchange/trackchange.pro index af10e745b..0406e78af 100644 --- a/src/plugins/General/trackchange/trackchange.pro +++ b/src/plugins/General/trackchange/trackchange.pro @@ -8,9 +8,7 @@ unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libtrackchange.so TEMPLATE = lib -unix : LIBS += -lqmmpui -lqmmp - -win32 : LIBS += -lqmmpui0 -lqmmp0 +LIBS += $${QMMPUI_LIB} RESOURCES = translations/translations.qrc unix { diff --git a/src/plugins/Output/directsound/outputdirectsound.cpp b/src/plugins/Output/directsound/outputdirectsound.cpp index d4f0bcd75..b04d8467f 100644 --- a/src/plugins/Output/directsound/outputdirectsound.cpp +++ b/src/plugins/Output/directsound/outputdirectsound.cpp @@ -20,6 +20,7 @@ #include <QObject>
#include <QSettings>
+#include <QMessageBox>
#include <string.h>
#include <iostream>
#include <unistd.h>
diff --git a/src/plugins/Output/directsound/outputdirectsound.h b/src/plugins/Output/directsound/outputdirectsound.h index 94a07d9b7..fca83fd0a 100644 --- a/src/plugins/Output/directsound/outputdirectsound.h +++ b/src/plugins/Output/directsound/outputdirectsound.h @@ -21,6 +21,7 @@ #ifndef OUTPUTDIRECTSOUND_H
#define OUTPUTDIRECTSOUND_H
+#include <QTranslator>
#include <stdio.h>
#include <windows.h>
#include <ksmedia.h>
diff --git a/src/plugins/Output/directsound/outputdirectsoundfactory.cpp b/src/plugins/Output/directsound/outputdirectsoundfactory.cpp index 99f294cc7..a05a9f3aa 100644 --- a/src/plugins/Output/directsound/outputdirectsoundfactory.cpp +++ b/src/plugins/Output/directsound/outputdirectsoundfactory.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-
+#include <QMessageBox>
#include "outputdirectsound.h"
#include "outputdirectsoundfactory.h"
diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp index f9eb0f684..85a94e615 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp +++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-
+#include <QMessageBox>
#include "outputwaveout.h"
#include "outputwaveoutfactory.h"
diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.h b/src/plugins/Output/waveout/outputwaveoutfactory.h index c8b992408..16675a27a 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.h +++ b/src/plugins/Output/waveout/outputwaveoutfactory.h @@ -24,6 +24,7 @@ #include <QString>
#include <QIODevice>
#include <QWidget>
+#include <QTranslator>
#include <qmmp/output.h>
#include <qmmp/outputfactory.h>
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index a08fde35f..35db085e3 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -5,8 +5,8 @@ QMAKE_LIBDIR += ../../../../lib win32 { QMAKE_LIBDIR += ../../../../bin PLUGINS_PREFIX=../../../../../bin/plugins - LIBS += -lqmmp0 - QMMPUI_LIB = -lqmmpui0 + LIBS += -lqmmp1 + QMMPUI_LIB = -lqmmpui1 } unix { diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro index 467ea8ddf..018654cab 100644 --- a/src/qmmpui/qmmpui.pro +++ b/src/qmmpui/qmmpui.pro @@ -22,7 +22,7 @@ unix { win32 { TARGET = ../../../bin/qmmpui - LIBS += -L../../bin -lqmmp0 -lole32 + LIBS += -L../../bin -lqmmp1 -lole32 HEADERS += winfileassoc.h \ winfileassocpage_p.h SOURCES += winfileassoc.cpp \ |