tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

downgradle qt to 5.15.2

Browse Source
This commit is contained in:
王劲鹏
2021-04-26 21:21:59 +08:00
committed by osborn
parent f012d835dd
commit 0a7b66aeb3
11 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doric-Qt/doric/utils/DoricLayouts.cpp
View File

@@ -492,9 +492,9 @@ void DoricLayouts::setFrame() {
<< " measuredX: " << this->measuredX
<< " measuredY: " << this->measuredY;
if (qFabs(this->measuredWidth - this->view->width() >= 0.00001f))
if (qAbs(this->measuredWidth - this->view->width() >= 0.00001f))
this->view->setProperty("width", this->measuredWidth);
if (qFabs(this->measuredHeight - this->view->height() >= 0.00001f))
if (qAbs(this->measuredHeight - this->view->height() >= 0.00001f))
this->view->setProperty("height", this->measuredHeight);
this->view->setProperty("x", this->measuredX);

2
doric-Qt/doric/utils/DoricUtils.h
View File

@@ -14,7 +14,7 @@ public:
QFile *file = new QFile(resource.fileName());
file->open(QFile::ReadOnly | QFile::Text);
QTextStream in(file);
in.setEncoding(QStringConverter::Encoding::Utf8);
in.setAutoDetectUnicode(true);
QString content = in.readAll();
file->close();
delete file;