X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=minitube.pro;h=942926e096f788684504b6dc2c4af4d3ed1cc46a;hb=2d872b1d000c8f8502c81d5676446f8b634aaa99;hp=75dda4e2dec03d255859381fa7f0cd55ee5da474;hpb=df8b2c951e66b538dd4d191220e883d86b700864;p=minitube

diff --git a/minitube.pro b/minitube.pro
index 75dda4e..942926e 100644
--- a/minitube.pro
+++ b/minitube.pro
@@ -1,8 +1,7 @@
 CONFIG += release
 TEMPLATE = app
-VERSION = 1.6
+VERSION = 2.1.6
 DEFINES += APP_VERSION="$$VERSION"
-INCLUDEPATH += /usr/include/phonon
 
 APP_NAME = Minitube
 DEFINES += APP_NAME="$$APP_NAME"
@@ -10,45 +9,34 @@ DEFINES += APP_NAME="$$APP_NAME"
 APP_UNIX_NAME = minitube
 DEFINES += APP_UNIX_NAME="$$APP_UNIX_NAME"
 
-DEFINES += QT_USE_FAST_CONCATENATION
-DEFINES += QT_USE_FAST_OPERATOR_PLUS
+DEFINES *= QT_NO_DEBUG_OUTPUT
+DEFINES *= QT_USE_QSTRINGBUILDER
+DEFINES += QT_STRICT_ITERATORS
+
+TARGET = $${APP_UNIX_NAME}
+
+QT += network xml phonon sql script
 
-# TODO Saner string behaviour
-# DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_STRICT_ITERATORS
-TARGET = minitube
-QT += network \
-    xml \
-    phonon
 include(src/qtsingleapplication/qtsingleapplication.pri)
-HEADERS += src/MainWindow.h \
-    src/SearchView.h \
-    src/MediaView.h \
-    src/AboutView.h \
-    src/youtubesearch.h \
+
+HEADERS += \
     src/video.h \
-    src/youtubestreamreader.h \
-    src/View.h \
     src/searchlineedit.h \
     src/urllineedit.h \
     src/spacer.h \
     src/constants.h \
-    src/iconloader/qticonloader.h \
-    src/ListModel.h \
-    src/playlist/PrettyItemDelegate.h \
+    src/playlistitemdelegate.h \
     src/networkaccess.h \
     src/videomimedata.h \
     src/global.h \
     src/updatechecker.h \
-    src/playlistwidget.h \
     src/searchparams.h \
     src/minisplitter.h \
     src/loadingwidget.h \
     src/videoareawidget.h \
     src/autocomplete.h \
-    src/videowidget.h \
     src/videodefinition.h \
     src/fontutils.h \
-    src/thlibrary/thblackbar.h \
     src/globalshortcuts.h \
     src/globalshortcutbackend.h \
     src/downloadmanager.h \
@@ -57,38 +45,62 @@ HEADERS += src/MainWindow.h \
     src/downloadmodel.h \
     src/downloadlistview.h \
     src/downloadsettings.h \
-    src/youtubesuggest.h \
     src/suggester.h \
     src/channelsuggest.h \
-    src/temporary.h
+    src/temporary.h \
+    src/segmentedcontrol.h \
+    src/playlistview.h \
+    src/refinesearchwidget.h \
+    src/refinesearchbutton.h \
+    src/sidebarwidget.h \
+    src/homeview.h \
+    src/aboutview.h \
+    src/mainwindow.h \
+    src/mediaview.h \
+    src/searchview.h \
+    src/view.h \
+    src/playlistmodel.h \
+    src/videosource.h \
+    src/ytsearch.h \
+    src/ytstandardfeed.h \
+    src/standardfeedsview.h \
+    src/ytregions.h \
+    src/ytcategories.h \
+    src/ytfeedreader.h \
+    src/ytsuggester.h \
+    src/videosourcewidget.h \
+    src/regionsview.h \
+    src/ytsinglevideosource.h \
+    src/sidebarheader.h \
+    src/utils.h \
+    src/diskcache.h \
+    src/gridwidget.h \
+    src/painterutils.h \
+    src/database.h \
+    src/ytuser.h \
+    src/channelaggregator.h \
+    src/channelmodel.h \
+    src/aggregatevideosource.h \
+    src/channelview.h \
+    src/channelitemdelegate.h \
+    src/jsfunctions.h \
+    src/seekslider.h
 SOURCES += src/main.cpp \
-    src/MainWindow.cpp \
-    src/SearchView.cpp \
-    src/MediaView.cpp \
-    src/AboutView.cpp \
-    src/youtubesearch.cpp \
-    src/youtubestreamreader.cpp \
     src/searchlineedit.cpp \
     src/urllineedit.cpp \
     src/spacer.cpp \
     src/video.cpp \
-    src/iconloader/qticonloader.cpp \
-    src/ListModel.cpp \
-    src/playlist/PrettyItemDelegate.cpp \
     src/videomimedata.cpp \
     src/updatechecker.cpp \
     src/networkaccess.cpp \
-    src/playlistwidget.cpp \
     src/searchparams.cpp \
     src/minisplitter.cpp \
     src/loadingwidget.cpp \
     src/videoareawidget.cpp \
     src/autocomplete.cpp \
-    src/videowidget.cpp \
     src/videodefinition.cpp \
     src/constants.cpp \
     src/fontutils.cpp \
-    src/thlibrary/thblackbar.cpp \
     src/globalshortcuts.cpp \
     src/globalshortcutbackend.cpp \
     src/downloadmanager.cpp \
@@ -97,9 +109,45 @@ SOURCES += src/main.cpp \
     src/downloadmodel.cpp \
     src/downloadlistview.cpp \
     src/downloadsettings.cpp \
-    src/youtubesuggest.cpp \
     src/channelsuggest.cpp \
-    src/temporary.cpp
+    src/temporary.cpp \
+    src/segmentedcontrol.cpp \
+    src/playlistview.cpp \
+    src/refinesearchwidget.cpp \
+    src/refinesearchbutton.cpp \
+    src/sidebarwidget.cpp \
+    src/homeview.cpp \
+    src/mainwindow.cpp \
+    src/mediaview.cpp \
+    src/aboutview.cpp \
+    src/searchview.cpp \
+    src/playlistitemdelegate.cpp \
+    src/playlistmodel.cpp \
+    src/videosource.cpp \
+    src/ytsearch.cpp \
+    src/ytstandardfeed.cpp \
+    src/standardfeedsview.cpp \
+    src/ytregions.cpp \
+    src/ytcategories.cpp \
+    src/ytfeedreader.cpp \
+    src/ytsuggester.cpp \
+    src/videosourcewidget.cpp \
+    src/regionsview.cpp \
+    src/ytsinglevideosource.cpp \
+    src/sidebarheader.cpp \
+    src/utils.cpp \
+    src/diskcache.cpp \
+    src/gridwidget.cpp \
+    src/painterutils.cpp \
+    src/database.cpp \
+    src/ytuser.cpp \
+    src/channelaggregator.cpp \
+    src/channelmodel.cpp \
+    src/aggregatevideosource.cpp \
+    src/channelview.cpp \
+    src/channelitemdelegate.cpp \
+    src/jsfunctions.cpp \
+    src/seekslider.cpp
 RESOURCES += resources.qrc
 DESTDIR = build/target/
 OBJECTS_DIR = build/obj/
@@ -112,9 +160,9 @@ CODECFORSRC = UTF-8
 include(locale/locale.pri)
 
 # deploy
-DISTFILES += CHANGES \
-    COPYING
-unix:!mac { 
+DISTFILES += CHANGES COPYING
+unix:!mac {
+    INCLUDEPATH += /usr/include/phonon
     QT += dbus
     HEADERS += src/gnomeglobalshortcutbackend.h
     SOURCES += src/gnomeglobalshortcutbackend.cpp
@@ -160,5 +208,4 @@ unix:!mac {
     icon512.path = $$DATADIR/icons/hicolor/512x512/apps
     icon512.files += data/512x512/minitube.png
 }
-mac|win32:include(local/local.pri)
-
+mac|win32|contains(DEFINES, APP_UBUNTU):include(local/local.pri)