Merge tag 'upstream/2.3.1'

[minitube] / minitube.pro

diff --git a/minitube.pro b/minitube.pro
index 0786842e40d02176a55084f228db8642565e08b1..effa02ed02b9d980f9ccaa1fcaee22cb59f2d20c 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
@@ -9,18 +9,24 @@ DEFINES += APP_NAME="$$APP_NAME"
 APP_UNIX_NAME = minitube
 DEFINES += APP_UNIX_NAME="$$APP_UNIX_NAME"
 
+DEFINES += APP_PHONON
+DEFINES += APP_PHONON_SEEK
+DEFINES += APP_SNAPSHOT
+
 DEFINES *= QT_NO_DEBUG_OUTPUT
 DEFINES *= QT_USE_QSTRINGBUILDER
-DEFINES += QT_STRICT_ITERATORS
+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
+}
 
 include(src/qtsingleapplication/qtsingleapplication.pri)
 
-HEADERS += \
-    src/video.h \
+HEADERS += src/video.h \
     src/searchlineedit.h \
     src/urllineedit.h \
     src/spacer.h \
@@ -72,7 +78,7 @@ HEADERS += \
     src/regionsview.h \
     src/ytsinglevideosource.h \
     src/sidebarheader.h \
-    src/utils.h \
+    src/iconutils.h \
     src/diskcache.h \
     src/gridwidget.h \
     src/painterutils.h \
@@ -84,7 +90,10 @@ HEADERS += \
     src/channelview.h \
     src/channelitemdelegate.h \
     src/jsfunctions.h \
-    src/seekslider.h
+    src/seekslider.h \
+    src/snapshotsettings.h \
+    src/snapshotpreview.h \
+    src/datautils.h
 SOURCES += src/main.cpp \
     src/searchlineedit.cpp \
     src/urllineedit.cpp \
@@ -135,7 +144,7 @@ SOURCES += src/main.cpp \
     src/regionsview.cpp \
     src/ytsinglevideosource.cpp \
     src/sidebarheader.cpp \
-    src/utils.cpp \
+    src/iconutils.cpp \
     src/diskcache.cpp \
     src/gridwidget.cpp \
     src/painterutils.cpp \
@@ -147,7 +156,10 @@ SOURCES += src/main.cpp \
     src/channelview.cpp \
     src/channelitemdelegate.cpp \
     src/jsfunctions.cpp \
-    src/seekslider.cpp
+    src/seekslider.cpp \
+    src/snapshotsettings.cpp \
+    src/snapshotpreview.cpp \
+    src/datautils.cpp
 RESOURCES += resources.qrc
 DESTDIR = build/target/
 OBJECTS_DIR = build/obj/
@@ -162,7 +174,13 @@ include(locale/locale.pri)
 # deploy
 DISTFILES += CHANGES COPYING
 unix:!mac {
-    INCLUDEPATH += /usr/include/phonon
+    qt:greaterThan(QT_MAJOR_VERSION, 4) {
+        LIBS += -lphonon4qt5
+        INCLUDEPATH += /usr/include/phonon4qt5
+    } else {
+        QT += phonon
+        INCLUDEPATH += /usr/include/phonon
+    }
     QT += dbus
     HEADERS += src/gnomeglobalshortcutbackend.h
     SOURCES += src/gnomeglobalshortcutbackend.cpp
@@ -209,3 +227,6 @@ unix:!mac {
     icon512.files += data/512x512/minitube.png
 }
 mac|win32|contains(DEFINES, APP_UBUNTU):include(local/local.pri)
+
+OTHER_FILES += \
+    sounds/snapshot.wav