Merge branch 'master' of github.com:royqh1979/RedPanda-CPP

2022-11-14 12:00:02 +08:00 · 2022-11-14 12:00:02 +08:00 · 0e76769c3b
parent ed8b0a4c55 bbd10785c5
commit 0e76769c3b
4 changed files with 9 additions and 4 deletions
--- a/RedPandaIDE/RedPandaIDE.pro
+++ b/RedPandaIDE/RedPandaIDE.pro
@ -10,7 +10,7 @@ isEmpty(APP_NAME) {
 }

 isEmpty(APP_VERSION) {
-    APP_VERSION = 2.5
+    APP_VERSION = 2.4
 }

 macos: {
--- a/RedPandaIDE/utils.cpp
+++ b/RedPandaIDE/utils.cpp
@ -10,9 +10,8 @@
 #include "project.h"
 #include "parser/cppparser.h"
 #include "compiler/executablerunner.h"
-#include <QMimeDatabase>
-#ifdef Q_OS_WIN
 #include <QComboBox>
+#ifdef Q_OS_WIN
 #include <windows.h>
 #endif

--- a/Red_Panda_CPP.pro
+++ b/Red_Panda_CPP.pro
@ -33,7 +33,7 @@ RedPandaIDE.depends += redpanda-git-askpass

 APP_NAME = RedPandaCPP

-APP_VERSION = 2.5
+APP_VERSION = 2.4

 linux: {
    isEmpty(PREFIX) {
--- a/packages/debian/changelog
+++ b/packages/debian/changelog
@ -1,3 +1,9 @@
+redpanda-cpp (2.4-1) unstable; urgency=medium
+
+  * Update to 2.4
+
+ -- Roy Qu (瞿华) <royqh1979@gmail.com>  Sun, 11 Nov 2022 19:58:00 +0800
+
 redpanda-cpp (2.3-1) unstable; urgency=medium

  * Update to 2.3