Fix RabbitRemoteControl_VERSION_REVISION

KangLin · Apr 28, 2023 · 951001c · 951001c
1 parent c16a709
commit 951001c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/App/Client/CMakeLists.txt b/App/Client/CMakeLists.txt
@@ -60,7 +60,7 @@ ADD_TARGET(NAME ${PROJECT_NAME}
     ISWINDOWS
     VERSION ${RabbitRemoteControl_VERSION}
     PRIVATE_DEFINITIONS RabbitRemoteControl_VERSION="${RabbitRemoteControl_VERSION}"
-      RabbitRemoteControl_VERSION_REVISION="${RabbitRemoteControl_VERSION_REVISION}"
+      RabbitRemoteControl_REVISION="${RabbitRemoteControl_REVISION}"
     SOURCE_FILES ${SOURCE_FILES} ${HEADER_FILES} ${SOURCE_UI_FILES} ${RCC_FILES}
     PRIVATE_LIBS Client)
 

diff --git a/App/Client/mainwindow.cpp b/App/Client/mainwindow.cpp
@@ -279,7 +279,7 @@ void MainWindow::on_actionAbout_A_triggered()
     QPixmap p = icon.pixmap(*sizeList.begin());
     about->m_AppIcon = p.toImage();
     about->m_szCopyrightStartTime = "2020";
-    about->m_szVersionRevision = RabbitRemoteControl_VERSION_REVISION;
+    about->m_szVersionRevision = RabbitRemoteControl_REVISION;
     QString szInfo;
     szInfo = tr("### Plugin") + "\n";
     m_Client.EnumPlugins([&szInfo](const QString& id, CPluginClient* pPlug)->int{

diff --git a/App/Service/CMakeLists.txt b/App/Service/CMakeLists.txt
@@ -41,7 +41,7 @@ ADD_TARGET(NAME ${PROJECT_NAME}
     ISEXE
     SOURCE_FILES ${SERVICE_SOURCE_FILES} ${SERVICE_HEADER_FILES} ${SERVICE_UI_FILES} ${RCC_FILES}
     PRIVATE_DEFINITIONS RabbitRemoteControl_VERSION="${RabbitRemoteControl_VERSION}"
-        RabbitRemoteControl_VERSION_REVISION="${RabbitRemoteControl_VERSION_REVISION}"
+        RabbitRemoteControl_REVISION="${RabbitRemoteControl_REVISION}"
     INCLUDE_DIRS
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> # See: http://www.it1352.com/478094.html
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>

diff --git a/App/ServiceConfigure/CMakeLists.txt b/App/ServiceConfigure/CMakeLists.txt
@@ -37,7 +37,7 @@ ADD_TARGET(NAME ${PROJECT_NAME}
     ISWINDOWS
     SOURCE_FILES ${SOURCE_FILES} ${HEADER_FILES} ${SOURCE_UI_FILES} ${RabbitRemoteControlServiceConfigure_RCC_FILES}
     PRIVATE_DEFINITIONS RabbitRemoteControl_VERSION="${RabbitRemoteControl_VERSION}"
-        RabbitRemoteControl_VERSION_REVISION="${RabbitRemoteControl_VERSION_REVISION}"
+        RabbitRemoteControl_REVISION="${RabbitRemoteControl_REVISION}"
     INCLUDE_DIRS
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> # See: http://www.it1352.com/478094.html
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>

diff --git a/App/ServiceConfigure/MainWindow.cpp b/App/ServiceConfigure/MainWindow.cpp
@@ -169,7 +169,7 @@ void CMainWindow::on_actionAbout_triggered()
     QPixmap p = icon.pixmap(*sizeList.begin());
     about->m_AppIcon = p.toImage();
     about->m_szCopyrightStartTime = "2020";
-    about->m_szVersionRevision = RabbitRemoteControl_VERSION_REVISION;
+    about->m_szVersionRevision = RabbitRemoteControl_REVISION;
     if(about->isHidden())
     {
 #ifdef BUILD_QUIWidget