Merge branch 'master' of github.com:royqh1979/RedPanda-CPP
This commit is contained in:
commit
0862c0555e
|
@ -4552,7 +4552,7 @@ QSize Editor::calcCompletionPopupSize()
|
|||
{
|
||||
#if QT_VERSION_MAJOR==5 && QT_VERSION_MINOR < 15
|
||||
int screenHeight = qApp->primaryScreen()->size().height();
|
||||
int screenWidht = qApp->primaryScreen()->size().width;
|
||||
int screenWidth = qApp->primaryScreen()->size().width();
|
||||
#else
|
||||
int screenHeight = screen()->size().height();
|
||||
int screenWidth = screen()->size().width();
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QMessageBox>
|
||||
#include <QUuid>
|
||||
#include "settings.h"
|
||||
#include "systemconsts.h"
|
||||
|
||||
|
|
|
@ -229,9 +229,6 @@ global function main(): CompilerHint
|
|||
)
|
||||
) then
|
||||
if C_FileSystem.isExecutable("/usr/bin/x86_64-w64-mingw32-gcc") then
|
||||
local extraObjects = {
|
||||
}
|
||||
|
||||
do
|
||||
local release, _, _ = generateConfig(
|
||||
lang, "GCC", "mingw",
|
||||
|
|
Loading…
Reference in New Issue