root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00
Code Issues Projects Releases Activity

Fixed Qt version with time zones support

Browse Source 
+ reverted broken Qt version check for opengl
This commit is contained in:
Martin Tůma 2020-05-30 17:06:06 +02:00
parent cc16c9e79b
commit 0999cdcba2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gpxsee.pro
View File

@ -14,7 +14,8 @@ greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets QT += widgets
QT += printsupport QT += printsupport
} }
lessThan(QT_VERSION, 5.4.0) {QT += opengl} lessThan(QT_MAJOR_VERSION, 5) {QT += opengl}
equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
INCLUDEPATH += ./src INCLUDEPATH += ./src
HEADERS += src/common/config.h \ HEADERS += src/common/config.h \
@ -196,7 +197,7 @@ HEADERS += src/common/config.h \
src/data/cupparser.h \ src/data/cupparser.h \
src/data/gpiparser.h \ src/data/gpiparser.h \
src/data/address.h \ src/data/address.h \
src/data/smlparser.h src/data/smlparser.h
SOURCES += src/main.cpp \ SOURCES += src/main.cpp \
src/GUI/popup.cpp \ src/GUI/popup.cpp \
src/common/coordinates.cpp \ src/common/coordinates.cpp \
@ -347,7 +348,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
HEADERS += src/data/geojsonparser.h HEADERS += src/data/geojsonparser.h
SOURCES += src/data/geojsonparser.cpp SOURCES += src/data/geojsonparser.cpp
} }
greaterThan(QT_VERSION, 5.1.0) { equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4) {
HEADERS += src/GUI/timezoneinfo.h HEADERS += src/GUI/timezoneinfo.h
} }

4
src/common/config.h
View File

@ -18,8 +18,8 @@
#define ENABLE_GEOJSON #define ENABLE_GEOJSON
#endif // QT >= 5.0 #endif // QT >= 5.0
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
#define ENABLE_TIMEZONES #define ENABLE_TIMEZONES
#endif // QT >= 5.2 #endif // QT >= 5.5
#endif /* CONFIG_H */ #endif /* CONFIG_H */