Merge branch 'about'

[someplayer] / someplayer.pro

diff --git a/someplayer.pro b/someplayer.pro
index 12e7248..eb13cc2 100644 (file)
--- a/someplayer.pro
+++ b/someplayer.pro
@@ -128,6 +128,7 @@ SOURCES += src/main.cpp\
     src/clickablelabel.cpp \
     src/settingsform.cpp \
     src/dbusclient.cpp \
+    src/fmtxsettingsdialog.cpp \
     src/aboutform.cpp
 
 HEADERS  += src/mainwindow.h \
@@ -235,6 +236,7 @@ HEADERS  += src/mainwindow.h \
     src/clickablelabel.h \
     src/settingsform.h \
     src/dbusclient.h \
+    src/fmtxsettingsdialog.h \
     src/aboutform.h
 
 FORMS    += src/ui/mainwindow.ui \
@@ -250,6 +252,7 @@ FORMS    += src/ui/mainwindow.ui \
     src/ui/managelibraryform.ui \
     src/ui/directoryview.ui \
     src/ui/settingsform.ui \
+    src/ui/fmtxsettingsdialog.ui \
     src/ui/aboutform.ui
 
 CONFIG += mobility