fix compilation with Qt 4.8.2 (closes #22)

Syntopia · Apr 14, 2015 · c80923787970663efb070fc0ad7fb940a512d51d · c809237
1 parent 942fc35
commit c80923787970663efb070fc0ad7fb940a512d51d
Unified Split

Showing with 14 additions and 0 deletions.

+10 −0 Fragmentarium-Source/Fragmentarium/GUI/DisplayWidget.cpp

+4 −0 Fragmentarium-Source/Fragmentarium/GUI/DisplayWidget.h
diff --git a/Fragmentarium-Source/Fragmentarium/GUI/DisplayWidget.cpp b/Fragmentarium-Source/Fragmentarium/GUI/DisplayWidget.cpp
@@ -35,9 +35,12 @@ namespace Fragmentarium {
                if (f & QGLFormat::OpenGL_Version_3_2) s.append("OpenGL3.2");
                if (f & QGLFormat::OpenGL_Version_3_3) s.append("OpenGL3.3");
                if (f & QGLFormat::OpenGL_Version_4_0) s.append("OpenGL4.0");
+#if (QT_VERSION > QT_VERSION_CHECK(4,8,2))
+                // support Debian Wheezy's old Qt version
                if (f & QGLFormat::OpenGL_Version_4_1) s.append("OpenGL4.1");
                if (f & QGLFormat::OpenGL_Version_4_2) s.append("OpenGL4.2");
                if (f & QGLFormat::OpenGL_Version_4_3) s.append("OpenGL4.3");
+#endif
                if (f & QGLFormat::OpenGL_ES_CommonLite_Version_1_0) s.append("OpenGL_ES_CL_1.0");
                if (f & QGLFormat::OpenGL_ES_Common_Version_1_0) s.append("OpenGL_ES_C_1.0");
                if (f & QGLFormat::OpenGL_ES_CommonLite_Version_1_1) s.append("OpenGL_ES_CL_1.1");
@@ -904,6 +907,13 @@ namespace Fragmentarium {
            glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
        }

+#if (QT_VERSION <= QT_VERSION_CHECK(4,8,2))
+        // support Debian Wheezy's old Qt version
+        double DisplayWidget::devicePixelRatio() {
+            return 1;
+        }
+#endif
+
        int DisplayWidget::pixelWidth() {
            return width() * devicePixelRatio();
        }
diff --git a/Fragmentarium-Source/Fragmentarium/GUI/DisplayWidget.h b/Fragmentarium-Source/Fragmentarium/GUI/DisplayWidget.h
@@ -86,6 +86,10 @@ namespace Fragmentarium {
            void mousePressEvent ( QMouseEvent * ev);
            void initializeGL();
            void paintEvent(QPaintEvent * ev);
+#if (QT_VERSION <= QT_VERSION_CHECK(4,8,2))
+            // support Debian Wheezy's old Qt version
+            double devicePixelRatio();
+#endif
            int pixelWidth();
            int pixelHeight();
            /// Actual drawing is implemented here