Preliminary Qt5 support

diff --git a/locale/locale.pri b/locale/locale.pri
index a9ff4b45b042c46e077d5a961060e6e4360b8214..fc472eee2344587b677d6fb1d6e565c269c760e4 100644 (file)
--- a/locale/locale.pri
+++ b/locale/locale.pri
@@ -2,6 +2,7 @@
 
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
+VPATH += $$PWD
 
 # ls -1 *.ts | tr '\n' ' '
 TRANSLATIONS += ar.ts ast.ts be.ts bg_BG.ts ca.ts ca_ES.ts cs_CZ.ts da.ts de_DE.ts el.ts en.ts es.ts es_AR.ts es_ES.ts es_MX.ts fi.ts fi_FI.ts fr.ts gl.ts he_IL.ts hr.ts hu.ts ia.ts it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts nn.ts pl.ts pl_PL.ts pt.ts pt_BR.ts ro.ts ru.ts sk.ts sl.ts sq.ts sv_SE.ts tr.ts uk.ts uk_UA.ts vi.ts zh_CN.ts zh_TW.ts 

diff --git a/minitube.pro b/minitube.pro
index 0786842e40d02176a55084f228db8642565e08b1..dd6c5c8422183b9b109dfa4159e038319d9811c6 100644 (file)
--- a/minitube.pro
+++ b/minitube.pro
@@ -1,6 +1,6 @@
 CONFIG += release
 TEMPLATE = app
-VERSION = 2.2
+VERSION = 2.3
 DEFINES += APP_VERSION="$$VERSION"
 
 APP_NAME = Minitube
@@ -15,7 +15,13 @@ DEFINES += QT_STRICT_ITERATORS
 
 TARGET = $${APP_UNIX_NAME}
 
-QT += network xml phonon sql script
+QT += network xml sql script
+
+qt:greaterThan(QT_MAJOR_VERSION, 4) {
+    contains(QT, gui): QT *= widgets
+} else {
+    QT += phonon
+}
 
 include(src/qtsingleapplication/qtsingleapplication.pri)
 

diff --git a/src/Suggester.h b/src/Suggester.h
index e14492f1320ff11ecefa6720033d064d563a12a3..a647cccb0935594b3aa331482882d64394d108fc 100644 (file)
--- a/src/Suggester.h
+++ b/src/Suggester.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define SUGGESTER_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class Suggester : public QObject {
 

diff --git a/src/aboutview.h b/src/aboutview.h
index 14c0bd12c3051f2896e3682d33743171e51da0b8..9bd251a1fe94d74bf6246fad314fc1169c581e2e 100644 (file)
--- a/src/aboutview.h
+++ b/src/aboutview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define ABOUTVIEW_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include "view.h"
 #include "constants.h"
 

diff --git a/src/autocomplete.h b/src/autocomplete.h
index 17a59530bf82c76d7678b6ed24705176b72360b0..65673f9fb5973b0e753ff21708bf81af51f4f034 100644 (file)
--- a/src/autocomplete.h
+++ b/src/autocomplete.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define SUGGESTCOMPLETION_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class Suggester;
 class SearchLineEdit;

diff --git a/src/channelitemdelegate.h b/src/channelitemdelegate.h
index 6e5543a3634a8dd3c7cb54e4519eab240165564a..7aef664f6cbfd89d5f005f10fc038d56a3ab03f2 100644 (file)
--- a/src/channelitemdelegate.h
+++ b/src/channelitemdelegate.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define CHANNELITEMDELEGATE_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class ChannelItemDelegate : public QStyledItemDelegate {
 

diff --git a/src/channelview.h b/src/channelview.h
index f8fa2067a81092905717009702a09b12ead17a5b..a108a4c4b81865e9edf3ce9af662b548f3ea9c3e 100644 (file)
--- a/src/channelview.h
+++ b/src/channelview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define CHANNELSVIEW_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include "view.h"
 
 class VideoSource;

diff --git a/src/downloadlistview.h b/src/downloadlistview.h
index 59514c692fd736d20741493a6e2c79477f4c3b06..c46d19b57aae514c06c6fd5b69bf6b8dee92a5cc 100644 (file)
--- a/src/downloadlistview.h
+++ b/src/downloadlistview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define DOWNLOADLISTVIEW_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class DownloadListView : public QListView {
 

diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index a07d7e394b3fdc050c40a41a1ca4b8f47ed3257b..01766df3d444df49bcf6f1a212ab35ffd4bafc09 100644 (file)
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define DOWNLOADMANAGER_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class DownloadItem;
 class DownloadModel;

diff --git a/src/downloadsettings.h b/src/downloadsettings.h
index f6d8e01a100bbacea59bdc8c893bf83472dd5d77..c740cbff164bb3276987ee8b8eac067d305af6e4 100644 (file)
--- a/src/downloadsettings.h
+++ b/src/downloadsettings.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define DOWNLOADSETTINGS_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class DownloadSettings : public QWidget {
 

diff --git a/src/downloadview.h b/src/downloadview.h
index 731c6f9898b40d84b685e7f27e28ef6226ae3d83..dccbf9c95a2705e2fa1055e837d39a0eb9becf68 100644 (file)
--- a/src/downloadview.h
+++ b/src/downloadview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define DOWNLOADVIEW_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include "view.h"
 
 class SegmentedControl;

diff --git a/src/global.h b/src/global.h
index 6057a83a56e97a033ade4fac2dd9b352944feff1..5bac445df6845ca8ae104299ce4aeb570e4665ad 100644 (file)
--- a/src/global.h
+++ b/src/global.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define GLOBAL_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include <QStringList>
 #include <QNetworkProxy>
 #include <QNetworkAccessManager>

diff --git a/src/gridwidget.h b/src/gridwidget.h
index 25756ca6480dcddb2da7a09c4258fd3af4baade2..efc61c3ffa2341b409d2f7fcf28b95a7f85c5af2 100644 (file)
--- a/src/gridwidget.h
+++ b/src/gridwidget.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define GRIDWIDGET_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class GridWidget : public QWidget {
 

diff --git a/src/homeview.h b/src/homeview.h
index 168a6105716b682fb0d38a98ee8adbb5ced0e5b0..7e4ddb7256d84623c5edc1ed1225c7d1c85560c8 100644 (file)
--- a/src/homeview.h
+++ b/src/homeview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define HOMEVIEW_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include "view.h"
 
 class SegmentedControl;

diff --git a/src/loadingwidget.h b/src/loadingwidget.h
index 37021f41ebba99b0b349c4c1cbed7ba2e3bd66b4..4c7a2d36baf554bfde488826f11d02d7276aa9e0 100644 (file)
--- a/src/loadingwidget.h
+++ b/src/loadingwidget.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define LOADINGWIDGET_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include "video.h"
 
 class LoadingWidget : public QWidget {

diff --git a/src/main.cpp b/src/main.cpp
index d26a9ff84226aec38be2371d97a00c2f0245e53d..a9717afeb4b9163a0c415b7a80ed9b0bc5a29e4a 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,6 +19,9 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include <qtsingleapplication.h>
 #include "constants.h"
 #include "mainwindow.h"

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 159ffb6f75bcac02bf94e35cc9a8c0af380291ca..e20bae0187e8c32afe3f3b45329d1ca633d58e53 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define MAINWINDOW_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include <phonon/audiooutput.h>
 #include <phonon/volumeslider.h>
 #include <phonon/mediaobject.h>

diff --git a/src/mediaview.h b/src/mediaview.h
index 2bc3f29e3a3e380822ff59abe6320f93df84d46d..15e9a8d2930402beea1a4421fa84148be461f372 100644 (file)
--- a/src/mediaview.h
+++ b/src/mediaview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define __MEDIAVIEW_H__
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include <QtNetwork>
 #include <phonon/mediaobject.h>
 #include <phonon/videowidget.h>

diff --git a/src/networkaccess.cpp b/src/networkaccess.cpp
index ea8b557b9d339a82d7582d6bd43bb72f419b1066..98e44ca8bf75fd329bf00fbc72b44f6362b7dbf0 100644 (file)
--- a/src/networkaccess.cpp
+++ b/src/networkaccess.cpp
@@ -21,6 +21,9 @@ $END_LICENSE */
 #include "networkaccess.h"
 #include "constants.h"
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 namespace The {
 NetworkAccess* http();

diff --git a/src/painterutils.h b/src/painterutils.h
index 35557bc642f8fda5a82aeed7e50e19988f4bc077..26bdbabb155b41f30202160e8d4c4f4a4a645865 100644 (file)
--- a/src/painterutils.h
+++ b/src/painterutils.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define PAINTERUTILS_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class PainterUtils {
 

diff --git a/src/playlistitemdelegate.h b/src/playlistitemdelegate.h
index 222ad9ac081fbb0db05d1efe7edfbc46aadeead6..0bbd77f06ceb3cf65d02c2d8bc762b4dc9e71914 100644 (file)
--- a/src/playlistitemdelegate.h
+++ b/src/playlistitemdelegate.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define PLAYLISTITEMDELEGATE_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class PlaylistItemDelegate : public QStyledItemDelegate {
 

diff --git a/src/playlistmodel.h b/src/playlistmodel.h
index a5c3b7c38992a10b4542a16229728b2d955d2ba3..88d6dcfea7601e24bfa3bb6a17449e9774485f21 100644 (file)
--- a/src/playlistmodel.h
+++ b/src/playlistmodel.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define PLAYLISTMODEL_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class Video;
 class VideoSource;

diff --git a/src/playlistview.h b/src/playlistview.h
index 82c5eddbe75f43679efbf5188aab74db5949369c..d40fc997f0b1320ed5c088d53a39efd21b71f520 100644 (file)
--- a/src/playlistview.h
+++ b/src/playlistview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define PLAYLISTVIEW_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class PlaylistView : public QListView {
 

diff --git a/src/refinesearchbutton.h b/src/refinesearchbutton.h
index a861d8fb616b03c16641b5b95849502694983a1c..22cf1f1b8dbfc5015ad56bb54bec9644c9795eb7 100644 (file)
--- a/src/refinesearchbutton.h
+++ b/src/refinesearchbutton.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define REFINESEARCHBUTTON_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class RefineSearchButton : public QPushButton
 {

diff --git a/src/refinesearchwidget.h b/src/refinesearchwidget.h
index 7330ca49e795ba8431edd33a8c0d1d981971121b..809d388690936aa2ed06a00a98e405aae8469609 100644 (file)
--- a/src/refinesearchwidget.h
+++ b/src/refinesearchwidget.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define REFINESEARCHWIDGET_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class SearchParams;
 

diff --git a/src/regionsview.h b/src/regionsview.h
index f0029ca214c365d75324524265456572ce98140d..73681881610ea038e50b44d073cb6e49032c4379 100644 (file)
--- a/src/regionsview.h
+++ b/src/regionsview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define REGIONSVIEW_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include "view.h"
 
 class YTRegion;

diff --git a/src/searchview.h b/src/searchview.h
index 9cefc717ec05643fca2bba1646aa53bd57778383..490a9a2a4262ad5efedfa16018fe7a16a6e145cd 100644 (file)
--- a/src/searchview.h
+++ b/src/searchview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define __SEARCHVIEW_H__
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include "view.h"
 
 class SearchLineEdit;

diff --git a/src/seekslider.h b/src/seekslider.h
index 87e6cb9e6d810eb5c6821cfe62325259e92641e6..decaeae92dadeac038d2de7d7a2022f915925965 100644 (file)
--- a/src/seekslider.h
+++ b/src/seekslider.h
@@ -2,6 +2,9 @@
 #define SEEKSLIDER_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class SeekSlider : public QSlider {
 

diff --git a/src/segmentedcontrol.h b/src/segmentedcontrol.h
index ba1ccdf9d028aa1a00b2f536a247c27fa339257f..bab83b1aaafcdbc5abcd059773cd9770a742ac56 100644 (file)
--- a/src/segmentedcontrol.h
+++ b/src/segmentedcontrol.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define SEGMENTEDCONTROL_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class SegmentedControl : public QWidget {
 

diff --git a/src/sidebarheader.h b/src/sidebarheader.h
index 8591d548cbbe789412e858e1b43fdd558b372401..0ac551ef8dae51279b0c57c4280ee70951bb1854 100644 (file)
--- a/src/sidebarheader.h
+++ b/src/sidebarheader.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define SIDEBARHEADER_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class SidebarHeader : public QToolBar {
 

diff --git a/src/sidebarwidget.h b/src/sidebarwidget.h
index cd8efe61639759191389a3e2529f65bc8aeff047..2a1da99b90f26533e09070baae32840147902080 100644 (file)
--- a/src/sidebarwidget.h
+++ b/src/sidebarwidget.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define SIDEBARWIDGET_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class RefineSearchButton;
 class RefineSearchWidget;

diff --git a/src/spacer.h b/src/spacer.h
index 88ae160823a8f83be3e4da2d6d56de0ea92d8586..a8118319f7001b5fad13f521422b5091ed5183fd 100644 (file)
--- a/src/spacer.h
+++ b/src/spacer.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define SPACER_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class Spacer : public QWidget {
 

diff --git a/src/standardfeedsview.h b/src/standardfeedsview.h
index 1d5214351fe9059ab3f267e047ca648490955582..f7e1485ffe2144e77a55f88f8fb9f1faaefb28b2 100644 (file)
--- a/src/standardfeedsview.h
+++ b/src/standardfeedsview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define CATEGORIESVIEW_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include "view.h"
 
 class VideoSource;

diff --git a/src/suggester.h b/src/suggester.h
index e14492f1320ff11ecefa6720033d064d563a12a3..a647cccb0935594b3aa331482882d64394d108fc 100644 (file)
--- a/src/suggester.h
+++ b/src/suggester.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define SUGGESTER_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class Suggester : public QObject {
 

diff --git a/src/utils.h b/src/utils.h
index b62bddf07c933f52650e161276153a3f7775b360..de0d9fb7679e1952b4e440d0e937db54b178d962 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define UTILS_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 class Utils {
 

diff --git a/src/video.h b/src/video.h
index dc7dd60f592a2dfaee890ef6fe2163589957884b..d16972315c82d69f0eeb391be9876b51a4c66c1e 100644 (file)
--- a/src/video.h
+++ b/src/video.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define VIDEO_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include <QtNetwork>
 
 class Video : public QObject {

diff --git a/src/videosourcewidget.h b/src/videosourcewidget.h
index 22c7740d38682084701fb382bf97d9193baa6400..1aab7c432d292b73c464ccb42bc02e4207781924 100644 (file)
--- a/src/videosourcewidget.h
+++ b/src/videosourcewidget.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define VIDEOSOURCEWIDGET_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include "gridwidget.h"
 
 class Video;

diff --git a/src/ytregions.h b/src/ytregions.h
index bae02865005b24e932f0cbe8e945f203ae232418..1ea5e8925c0049b7b67e5856d11dc9622a2d5d40 100644 (file)
--- a/src/ytregions.h
+++ b/src/ytregions.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define YTREGIONS_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 struct YTRegion {
     QString id;

diff --git a/src/ytuser.h b/src/ytuser.h
index 631a36601ff217eef25dc64d1cfb4f4a349d06e9..306cd1302cc4f6618bd9cc964b05256193d93c76 100644 (file)
--- a/src/ytuser.h
+++ b/src/ytuser.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define YTUSER_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include <QtNetwork>
 
 class YTUser : public QObject {