1
0
Fork 0
forked from len0rd/rockbox

Fix Qt5 / MinGW problems.

Add missing multimedia module and update some includes.

Change-Id: I98c65c4f2e21e6a63d552669468b1da313520499
This commit is contained in:
Dominik Riebeling 2013-04-03 23:43:27 +02:00
parent 801f3bbec4
commit 891351db60
5 changed files with 12 additions and 3 deletions

View file

@ -22,7 +22,9 @@
#ifndef AUTODETECTION_H_
#define AUTODETECTION_H_
#include <QtCore>
#include <QObject>
#include <QString>
#include <QList>
class Autodetection :public QObject
{

View file

@ -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());

View file

@ -176,6 +176,9 @@ QT += network
contains(QT_MAJOR_VERSION, 5) {
message("Qt5 found")
QT += widgets
win32 {
QT += multimedia
}
}
dbg {

View file

@ -17,6 +17,7 @@
****************************************************************************/
#include <QDialog>
#include <QDir>
#include "sysinfo.h"
#include "ui_sysinfofrm.h"
#include "system.h"

View file

@ -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;