devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix Qt5 / MinGW problems.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
rbutil/rbutilqt/base/autodetection.h
View file

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

4
rbutil/rbutilqt/configure.cpp
View file

@ -20,6 +20,9 @@
#include <QProgressDialog> #include <QProgressDialog>
#include <QFileDialog> #include <QFileDialog>
#include <QUrl> #include <QUrl>
#if !defined(Q_OS_LINUX)
#include <QSound>
#endif
#include "version.h" #include "version.h"
#include "configure.h" #include "configure.h"
@ -850,7 +853,6 @@ void Config::configTts()
{ {
int index = ui.comboTts->currentIndex(); int index = ui.comboTts->currentIndex();
TTSBase* tts = TTSBase::getTTS(this,ui.comboTts->itemData(index).toString()); TTSBase* tts = TTSBase::getTTS(this,ui.comboTts->itemData(index).toString());
EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(ui.comboTts->itemData(index).toString())); EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(ui.comboTts->itemData(index).toString()));
gui.exec(); gui.exec();
updateTtsState(ui.comboTts->currentIndex()); updateTtsState(ui.comboTts->currentIndex());

3
rbutil/rbutilqt/rbutilqt.pro
View file

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

3
rbutil/rbutilqt/sysinfo.cpp
View file

@ -17,6 +17,7 @@
****************************************************************************/ ****************************************************************************/
#include <QDialog> #include <QDialog>
#include <QDir>
#include "sysinfo.h" #include "sysinfo.h"
#include "ui_sysinfofrm.h" #include "ui_sysinfofrm.h"
#include "system.h" #include "system.h"
@ -27,7 +28,7 @@
Sysinfo::Sysinfo(QWidget *parent) : QDialog(parent) Sysinfo::Sysinfo(QWidget *parent) : QDialog(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
updateSysinfo(); updateSysinfo();
connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(close())); connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(close()));
connect(ui.buttonRefresh, SIGNAL(clicked()), this, SLOT(updateSysinfo())); connect(ui.buttonRefresh, SIGNAL(clicked()), this, SLOT(updateSysinfo()));

1
rbutil/rbutilqt/systrace.cpp
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 SysTrace::debug(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{ {
(void)type; (void)type;
(void)context;
QByteArray localMsg = msg.toLocal8Bit(); QByteArray localMsg = msg.toLocal8Bit();
if(lastmessage != msg) { if(lastmessage != msg) {
lastmessage = msg; lastmessage = msg;