From b0544a10640bce9096c5ecc82f0ea911c6dfd0bc Mon Sep 17 00:00:00 2001 From: AmonRaNet Date: Sun, 18 Apr 2021 23:55:45 +0200 Subject: [PATCH] Fix Windows build --- .pre-commit-config.yaml | 4 ++-- CMakeLists.txt | 0 README.md | 2 +- ReleaseNotes.md | 13 ++++++++++--- lib/include/QGeoView/QGVGlobal.h | 26 +++++++++++++------------- lib/src/QGVCamera.cpp | 0 6 files changed, 26 insertions(+), 19 deletions(-) mode change 100644 => 100755 CMakeLists.txt mode change 100644 => 100755 lib/include/QGeoView/QGVGlobal.h mode change 100644 => 100755 lib/src/QGVCamera.cpp diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index adbd156..1387793 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,13 +11,13 @@ repos: stages: [commit] - repo: https://github.com/pocc/pre-commit-hooks - rev: python + rev: v1.1.1 hooks: - id: clang-format args: [-i] - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.5.0 + rev: v3.4.0 hooks: - id: trailing-whitespace args: [--markdown-linebreak-ext=md] diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/README.md b/README.md index 8198e03..cbe148b 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ What things you need: * Qt 5.6 or higher (core, gui, widgets, network) * qmake or cmake * doxygen (optional) - * pre-commits (optional) https://pre-commit.com/ + * pre-commit (optional) https://pre-commit.com/ ### Installing diff --git a/ReleaseNotes.md b/ReleaseNotes.md index e4fff9d..92fac96 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,6 +1,13 @@ # Release Notes -## v1.0.2 - 26.04.2020 +## v1.0.3 + +- Fixed bug for Windows build +- Updated pre-commit requirements (python3) +- Added pre-commit github-workflow +- Added doxygen github-workflow + +## v1.0.2 Maintenance work: - Added git pre-commit hooks @@ -8,10 +15,10 @@ Maintenance work: - Fixed clang-format errors - Updated legacy header -## v1.0.1 - 30.12.2019 +## v1.0.1 Relicense to LGPL 3.0 instead of GPL 3.0 -## v1.0.0 - 17.09.2018 +## v1.0.0 Initial version diff --git a/lib/include/QGeoView/QGVGlobal.h b/lib/include/QGeoView/QGVGlobal.h old mode 100644 new mode 100755 index fea18ba..b80ed30 --- a/lib/include/QGeoView/QGVGlobal.h +++ b/lib/include/QGeoView/QGVGlobal.h @@ -162,24 +162,24 @@ class QGV_LIB_DECL GeoTilePos QPoint mPos; }; -void setNetworkManager(QNetworkAccessManager* manager); -QNetworkAccessManager* getNetworkManager(); +QGV_LIB_DECL void setNetworkManager(QNetworkAccessManager* manager); +QGV_LIB_DECL QNetworkAccessManager* getNetworkManager(); -QTransform createTransfrom(QPointF const& projAnchor, double scale, double azimuth); -QTransform createTransfromScale(QPointF const& projAnchor, double scale); -QTransform createTransfromAzimuth(QPointF const& projAnchor, double azimuth); -QPainterPath createTextPath(const QRect& rect, const QString& text, const QFont& font, int penWidth); +QGV_LIB_DECL QTransform createTransfrom(QPointF const& projAnchor, double scale, double azimuth); +QGV_LIB_DECL QTransform createTransfromScale(QPointF const& projAnchor, double scale); +QGV_LIB_DECL QTransform createTransfromAzimuth(QPointF const& projAnchor, double azimuth); +QGV_LIB_DECL QPainterPath createTextPath(const QRect& rect, const QString& text, const QFont& font, int penWidth); -void setDrawDebug(bool enabled); -bool isDrawDebug(); -void setPrintDebug(bool enabled); -bool isPrintDebug(); +QGV_LIB_DECL void setDrawDebug(bool enabled); +QGV_LIB_DECL bool isDrawDebug(); +QGV_LIB_DECL void setPrintDebug(bool enabled); +QGV_LIB_DECL bool isPrintDebug(); } // namespace QGV -QDebug operator<<(QDebug debug, const QGV::GeoPos& value); -QDebug operator<<(QDebug debug, const QGV::GeoRect& value); -QDebug operator<<(QDebug debug, const QGV::GeoTilePos& value); +QGV_LIB_DECL QDebug operator<<(QDebug debug, const QGV::GeoPos& value); +QGV_LIB_DECL QDebug operator<<(QDebug debug, const QGV::GeoRect& value); +QGV_LIB_DECL QDebug operator<<(QDebug debug, const QGV::GeoTilePos& value); Q_DECLARE_METATYPE(QGV::GeoPos) Q_DECLARE_METATYPE(QGV::GeoRect) diff --git a/lib/src/QGVCamera.cpp b/lib/src/QGVCamera.cpp old mode 100644 new mode 100755