First shot at 1.8-1

[minitube] / minitube.pro

diff --git a/minitube.pro b/minitube.pro
old mode 100755 (executable)
new mode 100644 (file)
index 94ac55e..1ba822f
--- a/minitube.pro
+++ b/minitube.pro
@@ -1,8 +1,16 @@
 CONFIG += release
 TEMPLATE = app
-VERSION = 1.3
+VERSION = 1.8
 DEFINES += APP_VERSION="$$VERSION"
-INCLUDEPATH += /usr/include/phonon
+
+APP_NAME = Minitube
+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
 
 # TODO Saner string behaviour
 # DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_STRICT_ITERATORS
@@ -24,7 +32,6 @@ HEADERS += src/MainWindow.h \
     src/spacer.h \
     src/constants.h \
     src/iconloader/qticonloader.h \
-    src/faderwidget/FaderWidget.h \
     src/ListModel.h \
     src/playlist/PrettyItemDelegate.h \
     src/networkaccess.h \
@@ -36,11 +43,10 @@ HEADERS += src/MainWindow.h \
     src/minisplitter.h \
     src/loadingwidget.h \
     src/videoareawidget.h \
-    src/googlesuggest.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 \
@@ -48,7 +54,13 @@ HEADERS += src/MainWindow.h \
     src/downloadview.h \
     src/downloadmodel.h \
     src/downloadlistview.h \
-    src/downloadsettings.h
+    src/downloadsettings.h \
+    src/youtubesuggest.h \
+    src/suggester.h \
+    src/channelsuggest.h \
+    src/temporary.h \
+    src/segmentedcontrol.h \
+    src/playlistview.h
 SOURCES += src/main.cpp \
     src/MainWindow.cpp \
     src/SearchView.cpp \
@@ -61,7 +73,6 @@ SOURCES += src/main.cpp \
     src/spacer.cpp \
     src/video.cpp \
     src/iconloader/qticonloader.cpp \
-    src/faderwidget/FaderWidget.cpp \
     src/ListModel.cpp \
     src/playlist/PrettyItemDelegate.cpp \
     src/videomimedata.cpp \
@@ -72,12 +83,11 @@ SOURCES += src/main.cpp \
     src/minisplitter.cpp \
     src/loadingwidget.cpp \
     src/videoareawidget.cpp \
-    src/googlesuggest.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 \
@@ -85,7 +95,12 @@ SOURCES += src/main.cpp \
     src/downloadview.cpp \
     src/downloadmodel.cpp \
     src/downloadlistview.cpp \
-    src/downloadsettings.cpp
+    src/downloadsettings.cpp \
+    src/youtubesuggest.cpp \
+    src/channelsuggest.cpp \
+    src/temporary.cpp \
+    src/segmentedcontrol.cpp \
+    src/playlistview.cpp
 RESOURCES += resources.qrc
 DESTDIR = build/target/
 OBJECTS_DIR = build/obj/
@@ -100,7 +115,8 @@ include(locale/locale.pri)
 # deploy
 DISTFILES += CHANGES \
     COPYING
-unix:!mac { 
+unix:!mac {
+    INCLUDEPATH += /usr/include/phonon
     QT += dbus
     HEADERS += src/gnomeglobalshortcutbackend.h
     SOURCES += src/gnomeglobalshortcutbackend.cpp
@@ -143,8 +159,6 @@ unix:!mac {
     icon128.files += data/128x128/minitube.png
     icon256.path = $$DATADIR/icons/hicolor/256x256/apps
     icon256.files += data/256x256/minitube.png
-    icon256.path = $$DATADIR/icons/hicolor/512x512/apps
-    icon256.files += data/256x256/minitube.png
     icon512.path = $$DATADIR/icons/hicolor/512x512/apps
     icon512.files += data/512x512/minitube.png
 }