rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Roy Qu 2024-04-12 17:12:16 +08:00
parent 680de80a37 6388e3ae23
commit 0862c0555e
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RedPandaIDE/editor.cpp
View File

@ -4552,7 +4552,7 @@ QSize Editor::calcCompletionPopupSize()
{ {
#if QT_VERSION_MAJOR==5 && QT_VERSION_MINOR < 15 #if QT_VERSION_MAJOR==5 && QT_VERSION_MINOR < 15
int screenHeight = qApp->primaryScreen()->size().height(); int screenHeight = qApp->primaryScreen()->size().height();
int screenWidht = qApp->primaryScreen()->size().width; int screenWidth = qApp->primaryScreen()->size().width();
#else #else
int screenHeight = screen()->size().height(); int screenHeight = screen()->size().height();
int screenWidth = screen()->size().width(); int screenWidth = screen()->size().width();

1
RedPandaIDE/toolsmanager.cpp
View File

@ -21,6 +21,7 @@
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonObject> #include <QJsonObject>
#include <QMessageBox> #include <QMessageBox>
#include <QUuid>
#include "settings.h" #include "settings.h"
#include "systemconsts.h" #include "systemconsts.h"

3
addon/compiler_hint/archlinux.tl
View File

@ -229,9 +229,6 @@ global function main(): CompilerHint
) )
) then ) then
if C_FileSystem.isExecutable("/usr/bin/x86_64-w64-mingw32-gcc") then if C_FileSystem.isExecutable("/usr/bin/x86_64-w64-mingw32-gcc") then
local extraObjects = {
}
do do
local release, _, _ = generateConfig( local release, _, _ = generateConfig(
lang, "GCC", "mingw", lang, "GCC", "mingw",