Version++

Fixed QOpenGLWidget usage (wrong minimal QT version)
2025-07-01 13:29:16 +02:00 · 2016-12-10 01:20:17 +01:00 · 2016-12-10 01:18:31 +01:00
6 changed files with 10 additions and 10 deletions
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -1,11 +1,11 @@
 TARGET = GPXSee
-VERSION = 3.3
+VERSION = 3.4
 QT += core \
    gui \
    network
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
-lessThan(QT_MAJOR_VERSION, 5) : QT += opengl
+lessThan(QT_VERSION, 5.4) : QT += opengl
 HEADERS += src/config.h \
    src/icons.h \
    src/gui.h \
--- a/pkg/gpxsee.nsi
+++ b/pkg/gpxsee.nsi
@ -4,7 +4,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "3.3"
+!define VERSION "3.4"

 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
--- a/pkg/gpxsee64.nsi
+++ b/pkg/gpxsee64.nsi
@ -4,7 +4,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "3.3"
+!define VERSION "3.4"

 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
--- a/src/app.cpp
+++ b/src/app.cpp
@ -4,7 +4,7 @@
 #include <QFileOpenEvent>
 #include <QNetworkProxyFactory>
 #include <QPixmapCache>
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
 #include <QGLFormat>
 #else // QT 5
 #include <QSurfaceFormat>
@ -27,7 +27,7 @@ App::App(int &argc, char **argv) : QApplication(argc, argv),

 	QNetworkProxyFactory::setUseSystemConfiguration(true);

-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
 	QGLFormat fmt;
 	fmt.setSamples(10);
 	QGLFormat::setDefaultFormat(fmt);
--- a/src/graphview.cpp
+++ b/src/graphview.cpp
@ -3,7 +3,7 @@
 #include <QMouseEvent>
 #include <QPaintEngine>
 #include <QPaintDevice>
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
 #include <QGLWidget>
 #else // QT 5
 #include <QOpenGLWidget>
@ -466,7 +466,7 @@ void GraphView::useOpenGL(bool use)
 #ifdef Q_OS_WIN32
 		if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
 #endif // Q_OS_WIN32
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
 		setViewport(new QGLWidget);
 #else // QT 5
 		setViewport(new QOpenGLWidget);
--- a/src/pathview.cpp
+++ b/src/pathview.cpp
@ -1,7 +1,7 @@
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QWheelEvent>
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
 #include <QGLWidget>
 #else // QT 5
 #include <QOpenGLWidget>
@ -716,7 +716,7 @@ void PathView::useOpenGL(bool use)
 #ifdef Q_OS_WIN32
 		if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
 #endif // Q_OS_WIN32
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
 		setViewport(new QGLWidget);
 #else // QT 5
 		setViewport(new QOpenGLWidget);
Author	SHA1	Message	Date
Martin Tůma	2fd16e5e31	Version++	2016-12-10 01:20:17 +01:00
Martin Tůma	a5033c8b19	Fixed QOpenGLWidget usage (wrong minimal QT version)	2016-12-10 01:18:31 +01:00