Upload 2.9-1 to unstable

[minitube] / minitube.pro

diff --git a/minitube.pro b/minitube.pro
index e218ab84f89a92ebbf622dc014bb4e646f5c3a66..453cf15f4b30093ec6ee02eb922a44ee165ec174 100644 (file)
--- a/minitube.pro
+++ b/minitube.pro
@@ -1,6 +1,7 @@
-CONFIG += release
+CONFIG += release c++11
+CONFIG -= rtti exceptions
 TEMPLATE = app
-VERSION = 2.5.1
+VERSION = 2.9
 DEFINES += APP_VERSION="$$VERSION"
 
 APP_NAME = Minitube
@@ -12,7 +13,6 @@ DEFINES += APP_UNIX_NAME="$$APP_UNIX_NAME"
 DEFINES += APP_PHONON
 DEFINES += APP_PHONON_SEEK
 DEFINES += APP_SNAPSHOT
-DEFINES += APP_YT3
 
 message(Building $${APP_NAME} $${VERSION})
 message(Qt $$[QT_VERSION] in $$[QT_INSTALL_PREFIX])
@@ -27,21 +27,18 @@ DEFINES *= QT_STRICT_ITERATORS
 
 TARGET = $${APP_UNIX_NAME}
 
-QT += network sql script
-qt:greaterThan(QT_MAJOR_VERSION, 4) {
-    contains(QT, gui): QT *= widgets
-}
+QT += widgets network sql qml
 
 include(src/qtsingleapplication/qtsingleapplication.pri)
+include(src/http/http.pri)
+include(src/idle/idle.pri)
 
 HEADERS += src/video.h \
     src/searchlineedit.h \
     src/spacer.h \
     src/constants.h \
     src/playlistitemdelegate.h \
-    src/networkaccess.h \
     src/videomimedata.h \
-    src/global.h \
     src/updatechecker.h \
     src/searchparams.h \
     src/minisplitter.h \
@@ -79,7 +76,6 @@ HEADERS += src/video.h \
     src/standardfeedsview.h \
     src/ytregions.h \
     src/ytcategories.h \
-    src/ytfeedreader.h \
     src/ytsuggester.h \
     src/videosourcewidget.h \
     src/regionsview.h \
@@ -104,18 +100,21 @@ HEADERS += src/video.h \
     src/ytchannel.h \
     src/yt3.h \
     src/paginatedvideosource.h \
-    src/compatibility/qurlqueryhelper.h \
-    src/compatibility/pathsservice.h \
     src/searchwidget.h \
     src/exlineedit.h \
-    src/channellistview.h
+    src/channellistview.h \
+    src/httputils.h \
+    src/appwidget.h \
+    src/clickablelabel.h \
+    src/ytvideo.h \
+    src/toolbarmenu.h \
+    src/sharetoolbar.h
 SOURCES += src/main.cpp \
     src/searchlineedit.cpp \
     src/spacer.cpp \
     src/video.cpp \
     src/videomimedata.cpp \
     src/updatechecker.cpp \
-    src/networkaccess.cpp \
     src/searchparams.cpp \
     src/minisplitter.cpp \
     src/loadingwidget.cpp \
@@ -152,7 +151,6 @@ SOURCES += src/main.cpp \
     src/standardfeedsview.cpp \
     src/ytregions.cpp \
     src/ytcategories.cpp \
-    src/ytfeedreader.cpp \
     src/ytsuggester.cpp \
     src/videosourcewidget.cpp \
     src/regionsview.cpp \
@@ -177,9 +175,14 @@ SOURCES += src/main.cpp \
     src/ytchannel.cpp \
     src/yt3.cpp \
     src/paginatedvideosource.cpp \
-    src/compatibility/pathsservice.cpp \
     src/exlineedit.cpp \
-    src/channellistview.cpp
+    src/channellistview.cpp \
+    src/httputils.cpp \
+    src/appwidget.cpp \
+    src/clickablelabel.cpp \
+    src/ytvideo.cpp \
+    src/toolbarmenu.cpp \
+    src/sharetoolbar.cpp
 RESOURCES += resources.qrc
 DESTDIR = build/target/
 OBJECTS_DIR = build/obj/
@@ -195,13 +198,8 @@ include(locale/locale.pri)
 DISTFILES += CHANGES COPYING
 unix:!mac {
     DEFINES += APP_LINUX
-    qt:greaterThan(QT_MAJOR_VERSION, 4) {
-        LIBS += -lphonon4qt5
-        INCLUDEPATH += /usr/include/phonon4qt5
-    } else {
-        QT += phonon
-        INCLUDEPATH += /usr/include/phonon
-    }
+    LIBS += -lphonon4qt5
+    INCLUDEPATH += /usr/include/phonon4qt5
     QT += dbus
     HEADERS += src/gnomeglobalshortcutbackend.h
     SOURCES += src/gnomeglobalshortcutbackend.cpp
@@ -215,6 +213,7 @@ unix:!mac {
         PKGDATADIR=\\\"$$PKGDATADIR\\\"
     INSTALLS += translations \
         desktop \
+        appdata \
         iconsvg \
         icon16 \
         icon22 \
@@ -228,6 +227,8 @@ unix:!mac {
     translations.files += $$DESTDIR/locale
     desktop.path = $$DATADIR/applications
     desktop.files += minitube.desktop
+    appdata.path = $$DATADIR/appdata
+    appdata.files += minitube.appdata.xml
     iconsvg.path = $$DATADIR/icons/hicolor/scalable/apps
     iconsvg.files += data/minitube.svg
     icon16.path = $$DATADIR/icons/hicolor/16x16/apps
@@ -248,6 +249,3 @@ unix:!mac {
     icon512.files += data/512x512/minitube.png
 }
 mac|win32|contains(DEFINES, APP_UBUNTU):include(local/local.pri)
-
-OTHER_FILES += \
-    sounds/snapshot.wav