Merge pull request #2102 from Cacodemon345/newqt

qt: Compatibility improvements

src/qt/qt_hardwarerenderer.cpp

@@ -32,7 +32,7 @@ extern "C" {
 
 void HardwareRenderer::resizeGL(int w, int h)
 {
-    glViewport(0, 0, w * devicePixelRatio(), h * devicePixelRatio());
+    glViewport(0, 0, qRound(w * devicePixelRatio()), qRound(h * devicePixelRatio()));
 }
 
 #define PROGRAM_VERTEX_ATTRIBUTE 0
@@ -141,11 +141,11 @@ void HardwareRenderer::paintGL() {
     QVector<QVector2D> verts, texcoords;
     QMatrix4x4 mat;
     mat.setToIdentity();
-    mat.ortho(QRect(0, 0, width(), height()));
+    mat.ortho(QRectF(0, 0, (qreal)width(), (qreal)height()));
     verts.push_back(QVector2D((float)destination.x(), (float)destination.y()));
-    verts.push_back(QVector2D((float)destination.x(), (float)destination.y() + destination.height()));
-    verts.push_back(QVector2D((float)destination.x() + destination.width(), (float)destination.y() + destination.height()));
-    verts.push_back(QVector2D((float)destination.x() + destination.width(), (float)destination.y()));
+    verts.push_back(QVector2D((float)destination.x(), (float)destination.y() + (float)destination.height()));
+    verts.push_back(QVector2D((float)destination.x() + (float)destination.width(), (float)destination.y() + (float)destination.height()));
+    verts.push_back(QVector2D((float)destination.x() + (float)destination.width(), (float)destination.y()));
     texcoords.push_back(QVector2D((float)source.x() / 2048.f, (float)(source.y()) / 2048.f));
     texcoords.push_back(QVector2D((float)source.x() / 2048.f, (float)(source.y() + source.height()) / 2048.f));
     texcoords.push_back(QVector2D((float)(source.x() + source.width()) / 2048.f, (float)(source.y() + source.height()) / 2048.f));

src/qt/qt_main.cpp

@@ -134,8 +134,11 @@ int main(int argc, char* argv[]) {
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #endif
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
+#endif
     QApplication app(argc, argv);
+    QLocale::setDefault(QLocale::C);
     qt_set_sequence_auto_mnemonic(false);
     Q_INIT_RESOURCE(qt_resources);
     Q_INIT_RESOURCE(qt_translations);

src/qt/qt_mainwindow.cpp

@@ -468,10 +468,9 @@ void MainWindow::showEvent(QShowEvent *event) {
         scrnsz_y = fixed_size_y;
     }
     else if (window_remember && vid_resize == 1) {
-        resize(window_w, window_h
-               + menuBar()->height()
-               + (hide_status_bar ? 0 : statusBar()->height())
-               + (hide_tool_bar ? 0 : ui->toolBar->height()) + 1);
+        ui->stackedWidget->setFixedSize(window_w, window_h);
+        adjustSize();
+        ui->stackedWidget->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
         scrnsz_x = window_w;
         scrnsz_y = window_h;
     }

src/qt/qt_renderercommon.hpp

@@ -7,6 +7,7 @@
 #include <vector>
 #include <tuple>
 #include <atomic>
+#include <memory>
 
 class QWidget;
 

src/qt/qt_rendererstack.cpp

@@ -138,10 +138,6 @@ void RendererStack::mousePressEvent(QMouseEvent *event)
     {
         mousedata.mousebuttons |= event->button();
     }
-    if (main_window->frameGeometry().contains(event->pos()) && !geometry().contains(event->pos()))
-    {
-        main_window->windowHandle()->startSystemMove();
-    }
     event->accept();
 }
 void RendererStack::wheelEvent(QWheelEvent *event)

src/qt/qt_softwarerenderer.cpp

@@ -76,7 +76,11 @@ void SoftwareRenderer::onPaint(QPaintDevice* device) {
 
     QPainter painter(device);
     painter.setRenderHint(QPainter::SmoothPixmapTransform, video_filter_method > 0 ? true : false);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     painter.fillRect(0, 0, device->width(), device->height(), QColorConstants::Black);
+#else
+    painter.fillRect(0,0, device->width(), device->height(), Qt::black);
+#endif
     painter.setCompositionMode(QPainter::CompositionMode_Plus);
     painter.drawImage(destination, *images[cur_image], source);
 }