From 891351db6001f51d7615f7190a8751adea861376 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Wed, 3 Apr 2013 23:43:27 +0200
Subject: Fix Qt5 / MinGW problems.

Add missing multimedia module and update some includes.

Change-Id: I98c65c4f2e21e6a63d552669468b1da313520499
---
 rbutil/rbutilqt/base/autodetection.h | 4 +++-
 rbutil/rbutilqt/configure.cpp        | 4 +++-
 rbutil/rbutilqt/rbutilqt.pro         | 3 +++
 rbutil/rbutilqt/sysinfo.cpp          | 3 ++-
 rbutil/rbutilqt/systrace.cpp         | 1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/rbutil/rbutilqt/base/autodetection.h b/rbutil/rbutilqt/base/autodetection.h
index a55de342f8..1543aef766 100644
--- a/rbutil/rbutilqt/base/autodetection.h
+++ b/rbutil/rbutilqt/base/autodetection.h
@@ -22,7 +22,9 @@
 #ifndef AUTODETECTION_H_
 #define AUTODETECTION_H_
 
-#include <QtCore>
+#include <QObject>
+#include <QString>
+#include <QList>
 
 class Autodetection :public QObject
 {
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 0867673593..ccf3eea465 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -20,6 +20,9 @@
 #include <QProgressDialog>
 #include <QFileDialog>
 #include <QUrl>
+#if !defined(Q_OS_LINUX)
+#include <QSound>
+#endif
 
 #include "version.h"
 #include "configure.h"
@@ -850,7 +853,6 @@ void Config::configTts()
 {
     int index = ui.comboTts->currentIndex();
     TTSBase* tts = TTSBase::getTTS(this,ui.comboTts->itemData(index).toString());
-
     EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(ui.comboTts->itemData(index).toString()));
     gui.exec();
     updateTtsState(ui.comboTts->currentIndex());
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index b5a18090a6..a082544dc2 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -176,6 +176,9 @@ QT += network
 contains(QT_MAJOR_VERSION, 5) {
     message("Qt5 found")
     QT += widgets
+    win32 {
+        QT += multimedia
+    }
 }
 
 dbg {
diff --git a/rbutil/rbutilqt/sysinfo.cpp b/rbutil/rbutilqt/sysinfo.cpp
index aeee76d056..3de387721c 100644
--- a/rbutil/rbutilqt/sysinfo.cpp
+++ b/rbutil/rbutilqt/sysinfo.cpp
@@ -17,6 +17,7 @@
  ****************************************************************************/
 
 #include <QDialog>
+#include <QDir>
 #include "sysinfo.h"
 #include "ui_sysinfofrm.h"
 #include "system.h"
@@ -27,7 +28,7 @@
 Sysinfo::Sysinfo(QWidget *parent) : QDialog(parent)
 {
     ui.setupUi(this);
-   
+
     updateSysinfo();
     connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(close()));
     connect(ui.buttonRefresh, SIGNAL(clicked()), this, SLOT(updateSysinfo()));
diff --git a/rbutil/rbutilqt/systrace.cpp b/rbutil/rbutilqt/systrace.cpp
index 943f34f7b9..dc8534af03 100644
--- a/rbutil/rbutilqt/systrace.cpp
+++ b/rbutil/rbutilqt/systrace.cpp
@@ -114,6 +114,7 @@ void SysTrace::debug(QtMsgType type, const char* msg)
 void SysTrace::debug(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
     (void)type;
+    (void)context;
     QByteArray localMsg = msg.toLocal8Bit();
     if(lastmessage != msg) {
         lastmessage = msg;
-- 
cgit