Update for Qt 6

wang-bin · Oct 3, 2022 · 7f99878 · 7f99878
1 parent e2bbc87
commit 7f99878
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/filter/X11FilterContext.cpp b/src/filter/X11FilterContext.cpp
@@ -182,7 +182,7 @@ void X11FilterContext::drawPlainText(const QPointF &pos, const QString &text)
     this->plain = true;
 
     QFontMetrics fm(font);
-    text_q = QImage(fm.width(text), fm.height(), QImage::Format_ARGB32);
+    text_q = QImage(fm.horizontalAdvance(text), fm.height(), QImage::Format_ARGB32);
     text_q.fill(0);
     painter->begin(&text_q);
     painter->translate(0, 0);

diff --git a/src/output/OutputSet.h b/src/output/OutputSet.h
@@ -22,6 +22,8 @@
 #ifndef QTAV_OUTPUTSET_H
 #define QTAV_OUTPUTSET_H
 
+#include <climits>
+
 #include <QtCore/QObject>
 #include <QtCore/QMutex>
 #include <QtCore/QWaitCondition>

diff --git a/src/utils/BlockingQueue.h b/src/utils/BlockingQueue.h
@@ -23,6 +23,8 @@
 #ifndef QTAV_BLOCKINGQUEUE_H
 #define QTAV_BLOCKINGQUEUE_H
 
+#include <climits>
+
 #include <QtCore/QReadWriteLock>
 #include <QtCore/QScopedPointer>
 #include <QtCore/QWaitCondition>