Bump version 2.15.4.0 Final

Greedysky · Oct 8, 2021 · 67a6b67 · 67a6b67
1 parent 4a6331c
commit 67a6b67
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 47 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.11)
 add_definitions(-DTTK_LIBRARY)
 add_definitions(-DQMMP_LIBRARY)
 
-set(TTK_MAJOR_VERSION "2.15.3")
+set(TTK_MAJOR_VERSION "2.15.4")
 set(TTK_VERSION ${TTK_MAJOR_VERSION}.0)
 
 # Find includes in the build directories
@@ -135,7 +135,6 @@ if(TTK_QT_VERSION VERSION_GREATER "4")
   find_package(Qt5Gui REQUIRED)
   find_package(Qt5Widgets REQUIRED)
   find_package(Qt5Multimedia REQUIRED)
-  find_package(Qt5MultimediaWidgets REQUIRED)
   find_package(Qt5Network REQUIRED)
   find_package(Qt5Xml REQUIRED)
   find_package(Qt5OpenGL REQUIRED)

diff --git a/ChangeLog b/ChangeLog
@@ -328,7 +328,7 @@ v2.15.3.0 Final 2021.09.27
 性能优化。
 Bug修复。
 
-v2.15.4.0 Final 2021.XX.XX
+v2.15.4.0 Final 2021.10.08
 移除用户管理模块。
 支持MPRIS模块。
 添加性能模式。

diff --git a/Doxyfile b/Doxyfile
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = TTKMusicplayer
-PROJECT_NUMBER         = 2.15.3.0
+PROJECT_NUMBER         = 2.15.4.0
 PROJECT_BRIEF          = "TTKMusicPlayer that imitation Kugou music, the music player use of qmmp core library based on Qt for windows and linux"
 PROJECT_LOGO           = TTKResource/lb_app_logo.png
 OUTPUT_DIRECTORY       = TTKDocs

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [简体中文 Chinese](./README_cn.md) | [繁体中文 Chinese](./README_tc.md)
 
 ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square)
-![Version](https://img.shields.io/badge/Version-2.15.3.0-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/Version-2.15.4.0-blue.svg?style=flat-square)
 ![License](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square)
 
 ![LOGO](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true)

diff --git a/README_cn.md b/README_cn.md
@@ -2,7 +2,7 @@
 [英文 English](./README.md) | [繁体中文 Chinese](./README_tc.md)
 
 ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square)
-![版本](https://img.shields.io/badge/Version-2.15.3.0-blue.svg?style=flat-square)
+![版本](https://img.shields.io/badge/Version-2.15.4.0-blue.svg?style=flat-square)
 ![许可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square)
 
 ![徽标](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true)

diff --git a/README_tc.md b/README_tc.md
@@ -2,7 +2,7 @@
 [简体中文 Chinese](./README_cn.md) | [英文 English](./README.md)
 
 ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square)
-![版本](https://img.shields.io/badge/Version-2.15.3.0-blue.svg?style=flat-square)
+![版本](https://img.shields.io/badge/Version-2.15.4.0-blue.svg?style=flat-square)
 ![許可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square)
 
 ![徽標](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true)

diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h
@@ -140,17 +140,17 @@
  * with this program; If not, see <http://www.gnu.org/licenses/>.
  ================================================= */
 
-//update time 2021.09.27
-#define TTKMUSIC_VERSION_STR    "2.15.3.0"
-#define TTKMUSIC_VERSION_WSTR   L"2.15.3.0"
-#define TTKMUSIC_VER_TIME_STR   "(2021/09/27)"
+//update time 2021.10.08
+#define TTKMUSIC_VERSION_STR    "2.15.4.0"
+#define TTKMUSIC_VERSION_WSTR   L"2.15.4.0"
+#define TTKMUSIC_VER_TIME_STR   "(2021/10/08)"
 
 #define TTKMUSIC_MAJOR_VERSION 2
 #define TTKMUSIC_MIDLE_VERSION 15
-#define TTKMUSIC_MINOR_VERSION 3
+#define TTKMUSIC_MINOR_VERSION 4
 #define TTKMUSIC_PATCH_VERSION 0
 
-#define TTKMUSIC_VERSION 0x02F30
+#define TTKMUSIC_VERSION 0x02F40
 
 #define TTKCONFIG_VERSION_STR    "1.0.0"
 

diff --git a/TTKConfig/TTKConfig.rc b/TTKConfig/TTKConfig.rc
@@ -7,8 +7,8 @@
 IDI_ICON1                ICON     DISCARDABLE     "../TTKResource/lb_app_logo.ico"
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,15,3,0
-    PRODUCTVERSION 2,15,3,0
+    FILEVERSION 2,15,4,0
+    PRODUCTVERSION 2,15,4,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -27,10 +27,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "TTKConfig"
-                VALUE "FileVersion", "2.15.3.0"
+                VALUE "FileVersion", "2.15.4.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
                 VALUE "ProductName", "TTKConfig"
-                VALUE "ProductVersion", "2.15.3.0"
+                VALUE "ProductVersion", "2.15.4.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKModule/CMakeLists.txt b/TTKModule/CMakeLists.txt
@@ -123,7 +123,7 @@ if(TTK_QT_VERSION VERSION_GREATER "4")
   else()
     add_library(${PROJECT_NAME} STATIC ${MUSIC_SOURCES} ${MUSIC_UIS_H} ${MUSIC_MOC_H} ${MUSIC_HEADERS})
   endif()
-  list(APPEND QT5_LIBS Qt5::Core Qt5::Network Qt5::Xml Qt5::Gui Qt5::Widgets Qt5::Multimedia Qt5::MultimediaWidgets ${TTK_QMMP_LIBRARY} TTKUi TTKExtras TTKWatcher TTKDumper zlib TTKZip)
+  list(APPEND QT5_LIBS Qt5::Core Qt5::Network Qt5::Xml Qt5::Gui Qt5::Widgets Qt5::Multimedia ${TTK_QMMP_LIBRARY} TTKUi TTKExtras TTKWatcher TTKDumper zlib TTKZip)
   if(WIN32)
     list(APPEND QT5_LIBS Qt5::WinExtras Iphlpapi Version ole32 uuid)
   else(UNIX)

diff --git a/TTKModule/TTKCore.rc b/TTKModule/TTKCore.rc
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,15,3,0
-    PRODUCTVERSION 2,15,3,0
+    FILEVERSION 2,15,4,0
+    PRODUCTVERSION 2,15,4,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -25,10 +25,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "TTKCore"
-                VALUE "FileVersion", "2.15.3.0"
+                VALUE "FileVersion", "2.15.4.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
                 VALUE "ProductName", "TTKCore"
-                VALUE "ProductVersion", "2.15.3.0"
+                VALUE "ProductVersion", "2.15.4.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKMusicPlayer.pri b/TTKMusicPlayer.pri
@@ -23,7 +23,7 @@ QT       += network
 CONFIG   += gcc
 }
 equals(QT_MAJOR_VERSION, 5){
-QT       += widgets multimediawidgets
+QT       += widgets multimedia
 }
 
 include($$PWD/TTKVersion.pri)

diff --git a/TTKResource/A_extras/TTKRoutine.sh b/TTKResource/A_extras/TTKRoutine.sh
@@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then
 fi  
 LD_LIBRARY_PATH=$dirpath  
 
-export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.15.3.0:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.15.4.0:$LD_LIBRARY_PATH
 export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH
 
 $appname "$@"
diff --git a/TTKRun/TTKApp/TTKApp.rc b/TTKRun/TTKApp/TTKApp.rc
@@ -7,8 +7,8 @@
 IDI_ICON1                ICON     DISCARDABLE     "../../TTKResource/lb_app_logo.ico"
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,15,3,0
-    PRODUCTVERSION 2,15,3,0
+    FILEVERSION 2,15,4,0
+    PRODUCTVERSION 2,15,4,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -27,12 +27,12 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "�������"
-                VALUE "FileVersion", "2.15.3.0"
+                VALUE "FileVersion", "2.15.4.0"
                 VALUE "InternalName", "�������.exe"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
                 VALUE "OriginalFilename", "�������.exe"
                 VALUE "ProductName", "�������"
-                VALUE "ProductVersion", "2.15.3.0"
+                VALUE "ProductVersion", "2.15.4.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKScript/deploy/package.sh b/TTKScript/deploy/package.sh
@@ -8,7 +8,7 @@ execpath="$PWD/../TTKMusicPlayer"
 
 echo -n "[Desktop Entry]
 Type=Application
-Version=2.15.3.0
+Version=2.15.4.0
 Name=TTKMusicPlayer
 Comment=天天酷音
 Icon=$iconpath

diff --git a/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml b/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml
@@ -18,7 +18,7 @@
   <developer_name>Greedysky Studio</developer_name>
 
   <releases>
-    <release version="2.15.3.0" date="2021-09-27">
+    <release version="2.15.4.0" date="2021-10-08">
     </release>
   </releases>
 </component>
diff --git a/TTKScript/linux_time.sh b/TTKScript/linux_time.sh
@@ -1,2 +1,2 @@
 #!/bin/sh  
-find . -exec touch -c -m -d "2021-09-27 12:00" {} \;
+find . -exec touch -c -m -d "2021-10-08 12:00" {} \;
diff --git a/TTKScript/make_auc.bat b/TTKScript/make_auc.bat
@@ -1,4 +1,4 @@
 "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKInit.exe"
 "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKMusicPlayer.exe"
 "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TKConsole.exe"
-"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.15.3.0/TTKService.exe"
+"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.15.4.0/TTKService.exe"
diff --git a/TTKScript/ttk.iss b/TTKScript/ttk.iss
@@ -2,7 +2,7 @@
 
 #define MyAppNameZh "天天酷音"
 #define MyAppNameEN "TTKMusicPlayer"
-#define MyAppVersion "2.15.3.0"
+#define MyAppVersion "2.15.4.0"
 #define MyAppPublisher "Greedysky Studio"
 #define MyAppCopyright "Copyright (c) 2015 - 2021 Greedysky Studio"
 #define MyAppURL "http://download.csdn.net/album/detail/3094"

diff --git a/TTKService/TTKService.rc b/TTKService/TTKService.rc
@@ -8,8 +8,8 @@ IDI_ICON1                ICON     DISCARDABLE     "../TTKResource/lb_app_logo.ic
 IDI_ICON2                ICON     DISCARDABLE     "../TTKResource/fileIcon/fileIcon.ico"
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,15,3,0
-    PRODUCTVERSION 2,15,3,0
+    FILEVERSION 2,15,4,0
+    PRODUCTVERSION 2,15,4,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -28,12 +28,12 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "�������"
-                VALUE "FileVersion", "2.15.3.0"
+                VALUE "FileVersion", "2.15.4.0"
                 VALUE "InternalName", "�������.exe"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
                 VALUE "OriginalFilename", "�������.exe"
                 VALUE "ProductName", "�������"
-                VALUE "ProductVersion", "2.15.3.0"
+                VALUE "ProductVersion", "2.15.4.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKThirdParty/TTKExtras/TTKExtras.rc b/TTKThirdParty/TTKExtras/TTKExtras.rc
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,15,3,0
-    PRODUCTVERSION 2,15,3,0
+    FILEVERSION 2,15,4,0
+    PRODUCTVERSION 2,15,4,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -25,10 +25,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "TTKExtras"
-                VALUE "FileVersion", "2.15.3.0"
+                VALUE "FileVersion", "2.15.4.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
                 VALUE "ProductName", "TTKExtras"
-                VALUE "ProductVersion", "2.15.3.0"
+                VALUE "ProductVersion", "2.15.4.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKUi/TTKUi.rc b/TTKUi/TTKUi.rc
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,15,3,0
-    PRODUCTVERSION 2,15,3,0
+    FILEVERSION 2,15,4,0
+    PRODUCTVERSION 2,15,4,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -25,10 +25,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "TTKUi"
-                VALUE "FileVersion", "2.15.3.0"
+                VALUE "FileVersion", "2.15.4.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
                 VALUE "ProductName", "TTKUi"
-                VALUE "ProductVersion", "2.15.3.0"
+                VALUE "ProductVersion", "2.15.4.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKVersion.pri b/TTKVersion.pri
@@ -21,5 +21,5 @@ MOC_DIR = ./.build/moc
 OBJECTS_DIR = ./.build/obj
 RCC_DIR = ./.build/rcc
 
-# update time 2021.09.27
-TTKMusicPlayer = 2.15.3.0
+# update time 2021.10.08
+TTKMusicPlayer = 2.15.4.0