diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-04-03 23:43:27 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-04-04 22:42:22 +0200 |
commit | 891351db6001f51d7615f7190a8751adea861376 (patch) | |
tree | 275a1f237a397c60b6e151a616bc91fe9744c533 /rbutil/rbutilqt | |
parent | 801f3bbec49eb7d6ff2c0a8142acc991a322765a (diff) | |
download | rockbox-891351db6001f51d7615f7190a8751adea861376.tar.gz rockbox-891351db6001f51d7615f7190a8751adea861376.zip |
Fix Qt5 / MinGW problems.
Add missing multimedia module and update some includes.
Change-Id: I98c65c4f2e21e6a63d552669468b1da313520499
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/base/autodetection.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/sysinfo.cpp | 3 | ||||
-rw-r--r-- | 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 @@ | |||
22 | #ifndef AUTODETECTION_H_ | 22 | #ifndef AUTODETECTION_H_ |
23 | #define AUTODETECTION_H_ | 23 | #define AUTODETECTION_H_ |
24 | 24 | ||
25 | #include <QtCore> | 25 | #include <QObject> |
26 | #include <QString> | ||
27 | #include <QList> | ||
26 | 28 | ||
27 | class Autodetection :public QObject | 29 | class Autodetection :public QObject |
28 | { | 30 | { |
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 @@ | |||
20 | #include <QProgressDialog> | 20 | #include <QProgressDialog> |
21 | #include <QFileDialog> | 21 | #include <QFileDialog> |
22 | #include <QUrl> | 22 | #include <QUrl> |
23 | #if !defined(Q_OS_LINUX) | ||
24 | #include <QSound> | ||
25 | #endif | ||
23 | 26 | ||
24 | #include "version.h" | 27 | #include "version.h" |
25 | #include "configure.h" | 28 | #include "configure.h" |
@@ -850,7 +853,6 @@ void Config::configTts() | |||
850 | { | 853 | { |
851 | int index = ui.comboTts->currentIndex(); | 854 | int index = ui.comboTts->currentIndex(); |
852 | TTSBase* tts = TTSBase::getTTS(this,ui.comboTts->itemData(index).toString()); | 855 | TTSBase* tts = TTSBase::getTTS(this,ui.comboTts->itemData(index).toString()); |
853 | |||
854 | EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(ui.comboTts->itemData(index).toString())); | 856 | EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(ui.comboTts->itemData(index).toString())); |
855 | gui.exec(); | 857 | gui.exec(); |
856 | updateTtsState(ui.comboTts->currentIndex()); | 858 | 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 | |||
176 | contains(QT_MAJOR_VERSION, 5) { | 176 | contains(QT_MAJOR_VERSION, 5) { |
177 | message("Qt5 found") | 177 | message("Qt5 found") |
178 | QT += widgets | 178 | QT += widgets |
179 | win32 { | ||
180 | QT += multimedia | ||
181 | } | ||
179 | } | 182 | } |
180 | 183 | ||
181 | dbg { | 184 | 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 @@ | |||
17 | ****************************************************************************/ | 17 | ****************************************************************************/ |
18 | 18 | ||
19 | #include <QDialog> | 19 | #include <QDialog> |
20 | #include <QDir> | ||
20 | #include "sysinfo.h" | 21 | #include "sysinfo.h" |
21 | #include "ui_sysinfofrm.h" | 22 | #include "ui_sysinfofrm.h" |
22 | #include "system.h" | 23 | #include "system.h" |
@@ -27,7 +28,7 @@ | |||
27 | Sysinfo::Sysinfo(QWidget *parent) : QDialog(parent) | 28 | Sysinfo::Sysinfo(QWidget *parent) : QDialog(parent) |
28 | { | 29 | { |
29 | ui.setupUi(this); | 30 | ui.setupUi(this); |
30 | 31 | ||
31 | updateSysinfo(); | 32 | updateSysinfo(); |
32 | connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(close())); | 33 | connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(close())); |
33 | connect(ui.buttonRefresh, SIGNAL(clicked()), this, SLOT(updateSysinfo())); | 34 | 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) | |||
114 | void SysTrace::debug(QtMsgType type, const QMessageLogContext &context, const QString &msg) | 114 | void SysTrace::debug(QtMsgType type, const QMessageLogContext &context, const QString &msg) |
115 | { | 115 | { |
116 | (void)type; | 116 | (void)type; |
117 | (void)context; | ||
117 | QByteArray localMsg = msg.toLocal8Bit(); | 118 | QByteArray localMsg = msg.toLocal8Bit(); |
118 | if(lastmessage != msg) { | 119 | if(lastmessage != msg) { |
119 | lastmessage = msg; | 120 | lastmessage = msg; |