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 handling in build process

Browse Source
This commit is contained in:
Martin Tůma 2018-07-24 17:23:14 +02:00
parent 34de55cf0c
commit 004e9bfef3
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gpxsee.pro
View File

@ -1,12 +1,16 @@
TARGET = GPXSee TARGET = GPXSee
VERSION = 5.16 VERSION = 5.16
QT += core \ QT += core \
gui \ gui \
network network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4) {
greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport QT += widgets
lessThan(QT_VERSION, 5.4): QT += opengl QT += printsupport
macx: QT += opengl }
lessThan(QT_MAJOR_VERSION, 5) {QT += opengl}
equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 5) {QT += opengl}
INCLUDEPATH += ./src INCLUDEPATH += ./src
HEADERS += src/config.h \ HEADERS += src/config.h \
src/common/staticassert.h \ src/common/staticassert.h \
@ -235,6 +239,7 @@ SOURCES += src/main.cpp \
src/map/jnxmap.cpp \ src/map/jnxmap.cpp \
src/map/krovak.cpp \ src/map/krovak.cpp \
src/map/map.cpp src/map/map.cpp
RESOURCES += gpxsee.qrc RESOURCES += gpxsee.qrc
TRANSLATIONS = lang/gpxsee_cs.ts \ TRANSLATIONS = lang/gpxsee_cs.ts \
lang/gpxsee_sv.ts \ lang/gpxsee_sv.ts \
@ -243,6 +248,7 @@ TRANSLATIONS = lang/gpxsee_cs.ts \
lang/gpxsee_fi.ts \ lang/gpxsee_fi.ts \
lang/gpxsee_fr.ts \ lang/gpxsee_fr.ts \
lang/gpxsee_pl.ts lang/gpxsee_pl.ts
macx { macx {
ICON = icons/gpxsee.icns ICON = icons/gpxsee.icns
QMAKE_INFO_PLIST = pkg/Info.plist QMAKE_INFO_PLIST = pkg/Info.plist
@ -283,5 +289,5 @@ win32 {
icons/wpt.ico icons/wpt.ico
DEFINES += _USE_MATH_DEFINES DEFINES += _USE_MATH_DEFINES
} }
DEFINES += APP_VERSION=\\\"$$VERSION\\\" DEFINES += APP_VERSION=\\\"$$VERSION\\\"
greaterThan(QT_VERSION, 5.10.0): DEFINES += ENABLE_HTTP2

1
src/GUI/optionsdialog.cpp
View File

@ -12,7 +12,6 @@
#include <QRadioButton> #include <QRadioButton>
#include <QLabel> #include <QLabel>
#include <QSysInfo> #include <QSysInfo>
#include "config.h"
#include "icons.h" #include "icons.h"
#include "colorbox.h" #include "colorbox.h"
#include "stylecombobox.h" #include "stylecombobox.h"

1
src/GUI/optionsdialog.h
View File

@ -4,6 +4,7 @@
#include <QDialog> #include <QDialog>
#include "palette.h" #include "palette.h"
#include "units.h" #include "units.h"
#include "config.h"
class ColorBox; class ColorBox;

4
src/config.h
View File

@ -46,4 +46,8 @@
#define TILES_DIR USER_DIR + QString("/tiles") #define TILES_DIR USER_DIR + QString("/tiles")
#define TRANSLATIONS_DIR GLOBAL_DIR + QString("/translations") #define TRANSLATIONS_DIR GLOBAL_DIR + QString("/translations")
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 1))
#define ENABLE_HTTP2
#endif // QT >= 5.10.1
#endif /* CONFIG_H */ #endif /* CONFIG_H */

1
src/map/downloader.cpp
View File

@ -2,7 +2,6 @@
#include <QFileInfo> #include <QFileInfo>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QBasicTimer> #include <QBasicTimer>
#include "config.h"
#include "downloader.h" #include "downloader.h"

1
src/map/downloader.h
View File

@ -7,6 +7,7 @@
#include <QList> #include <QList>
#include <QSet> #include <QSet>
#include <QHash> #include <QHash>
#include "config.h"
class Download class Download