mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-29 14:52:12 +01:00
Merge branch 'master' into OP-367_UAVObject_Query
This commit is contained in:
commit
2c89d34e2a
@ -35,7 +35,10 @@
|
||||
#include "notifypluginconfiguration.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <phonon>
|
||||
#include <Phonon/MediaObject>
|
||||
#include <Phonon/Path>
|
||||
#include <Phonon/AudioOutput>
|
||||
#include <Phonon/Global>
|
||||
|
||||
class NotifyPluginOptionsPage;
|
||||
|
||||
|
@ -38,7 +38,10 @@
|
||||
#include <QItemSelectionModel>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QSettings>
|
||||
#include <phonon>
|
||||
#include <Phonon/MediaObject>
|
||||
#include <Phonon/Path>
|
||||
#include <Phonon/AudioOutput>
|
||||
#include <Phonon/Global>
|
||||
|
||||
class NotifyTableModel;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user