aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Roy Bratusek <nano@jpberlin.de>2014-11-04 18:10:54 +0100
committerChristopher Roy Bratusek <nano@jpberlin.de>2014-11-04 18:10:54 +0100
commit3176806823acfabb3b3a7f7c43ed8cfffa499dc4 (patch)
treee24e18020dfdd2db6da5cd21320a2ddfc45196d9
parentMerge remote-tracking branch 'upstream/master' (diff)
parentMerge pull request #21 from rezso/master (diff)
downloadlumina-3176806823acfabb3b3a7f7c43ed8cfffa499dc4.tar.gz
lumina-3176806823acfabb3b3a7f7c43ed8cfffa499dc4.tar.bz2
lumina-3176806823acfabb3b3a7f7c43ed8cfffa499dc4.zip
Merge remote-tracking branch 'upstream/master'
-rw-r--r--lumina-desktop/LSession.h1
-rw-r--r--lumina-fm/MainUI.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/lumina-desktop/LSession.h b/lumina-desktop/LSession.h
index 8814ca3c..1e773f74 100644
--- a/lumina-desktop/LSession.h
+++ b/lumina-desktop/LSession.h
@@ -21,6 +21,7 @@
#include <Phonon/MediaObject>
#include <Phonon/AudioOutput>
#include <QThread>
+#include <QUrl>
#include "Globals.h"
#include "AppMenu.h"
diff --git a/lumina-fm/MainUI.h b/lumina-fm/MainUI.h
index fea56549..31a0269e 100644
--- a/lumina-fm/MainUI.h
+++ b/lumina-fm/MainUI.h
@@ -37,6 +37,7 @@
#include <QResizeEvent>
#include <QDesktopWidget>
#include <QThread>
+#include <QUrl>
//Phonon widgets
#include <Phonon/BackendCapabilities>
bgstack15