diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2019-06-18 13:37:12 +0200 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2019-06-18 13:37:12 +0200 |
| commit | 976ab4b79860626077a266f90261da257c959efc (patch) | |
| tree | 5d848d660b7ddc33c2917f2369e89a681e3c35d0 | |
| parent | 3974cb7e4821b4e131cd677fd609433a05c453b3 (diff) | |
| download | navit-976ab4b79860626077a266f90261da257c959efc.tar.gz | |
fix:graphics:qt5: Remove unnecessary moc includes. (#798)
* Remove unnecessary moc includes.
This commit removes moc file includes for some classes which do not
define new qt classes. This caused a long standing warning which seems
to be treated as error on some setups.
* Make (in)sanity check happy.
Here you got your bloody spaces. Uber picky, isn't it?
* Remove QAudio::interruptedState again
Sailfish version of QT doesn't feature this yet.
| -rw-r--r-- | navit/graphics/qt5/QNavitWidget.cpp | 2 | ||||
| -rw-r--r-- | navit/graphics/qt5/event_qt5.cpp | 2 | ||||
| -rw-r--r-- | navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp | 3 | ||||
| -rw-r--r-- | navit/vehicle/qt5/vehicle_qt5.cpp | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/navit/graphics/qt5/QNavitWidget.cpp b/navit/graphics/qt5/QNavitWidget.cpp index 355187b49..869d5f2ec 100644 --- a/navit/graphics/qt5/QNavitWidget.cpp +++ b/navit/graphics/qt5/QNavitWidget.cpp @@ -41,7 +41,7 @@ extern "C" { #include <windows.h> #endif #include "QNavitWidget.h" -#include "QNavitWidget.moc" +//#include "QNavitWidget.moc" #include "graphics_qt5.h" QNavitWidget::QNavitWidget(struct graphics_priv* my_graphics_priv, diff --git a/navit/graphics/qt5/event_qt5.cpp b/navit/graphics/qt5/event_qt5.cpp index 7186534fe..99361011c 100644 --- a/navit/graphics/qt5/event_qt5.cpp +++ b/navit/graphics/qt5/event_qt5.cpp @@ -44,7 +44,7 @@ extern "C" { #endif #include "event_qt5.h" -#include "event_qt5.moc" +//#include "event_qt5.moc" #include "graphics_qt5.h" #include <QSocketNotifier> diff --git a/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp b/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp index a5e488391..f8f8339eb 100644 --- a/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp +++ b/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp @@ -81,6 +81,9 @@ void Qt5EspeakAudioOut::handleStateChanged(QAudio::State newState) { break; case QAudio::StoppedState: break; +// Sailfish's QT version doesn't have this. Doesn't do anything either. +// case QAudio::InterruptedState: +// break; case QAudio::IdleState: /*remove all data that was already read*/ data->remove(0, buffer->pos()); diff --git a/navit/vehicle/qt5/vehicle_qt5.cpp b/navit/vehicle/qt5/vehicle_qt5.cpp index b855d12b9..9c613ca54 100644 --- a/navit/vehicle/qt5/vehicle_qt5.cpp +++ b/navit/vehicle/qt5/vehicle_qt5.cpp @@ -38,7 +38,7 @@ extern "C" { #include <time.h> #include "vehicle_qt5.h" -#include "vehicle_qt5.moc" +//#include "vehicle_qt5.moc" #include <QDateTime> /** |