Compare commits

..

No commits in common. "559ade2bab0a34ff7cad40d6bf7e6376eebeab95" and "ff3d11e8da6e3c472d3d71965cab9a476019ffea" have entirely different histories.

5 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
version: 3.1.{build} version: 3.0.{build}
configuration: configuration:
- Release - Release

View File

@ -8,18 +8,18 @@ on:
jobs: jobs:
build: build:
name: QtPBFImagePlugin name: QtPBFImagePlugin
runs-on: ubuntu-22.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Install protobuf compiler - name: Install protobuf compiler
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install protobuf-compiler sudo apt-get install protobuf-compiler
- name: set up JDK 11 - name: set up JDK 11
uses: actions/setup-java@v4 uses: actions/setup-java@v3
with: with:
distribution: 'temurin' distribution: 'zulu'
java-version: '11' java-version: '11'
- name: Setup Android SDK - name: Setup Android SDK
uses: android-actions/setup-android@v3 uses: android-actions/setup-android@v3
@ -48,7 +48,7 @@ jobs:
- name: Build project - name: Build project
run: make -j2 run: make -j2
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v3
with: with:
name: libplugins_imageformats_libpbf_arm64-v8a.so name: libplugins_imageformats_libpbf_arm64-v8a.so
path: plugins/libplugins_imageformats_libpbf_arm64-v8a.so path: plugins/libplugins_imageformats_libpbf_arm64-v8a.so

View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get update sudo apt-get update

View File

@ -13,7 +13,7 @@ jobs:
- name: Set environment variables - name: Set environment variables
run: echo "PATH=/usr/local/opt/qt@5/bin:/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV run: echo "PATH=/usr/local/opt/qt@5/bin:/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Install dependencies - name: Install dependencies
run: brew install qt@5 protobuf@21 run: brew install qt@5 protobuf@21
- name: Configure build - name: Configure build
@ -28,7 +28,7 @@ jobs:
- name: Set environment variables - name: Set environment variables
run: echo "PATH=/usr/local/opt/qt@6/bin:/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV run: echo "PATH=/usr/local/opt/qt@6/bin:/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Install dependencies - name: Install dependencies
run: brew install qt@6 protobuf@21 run: brew install qt@6 protobuf@21
- name: Configure build - name: Configure build

View File

@ -2,7 +2,7 @@ TARGET = pbf
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
QT += gui QT += gui
VERSION = 3.1 VERSION = 3.0
PROTOS = protobuf/vector_tile.proto PROTOS = protobuf/vector_tile.proto
include(protobuf/vector_tile.pri) include(protobuf/vector_tile.pri)
@ -54,7 +54,7 @@ win32 {
QMAKE_TARGET_PRODUCT = QtPBFImagePlugin QMAKE_TARGET_PRODUCT = QtPBFImagePlugin
QMAKE_TARGET_DESCRIPTION = Qt $$QT_VERSION MVT/PBF image plugin QMAKE_TARGET_DESCRIPTION = Qt $$QT_VERSION MVT/PBF image plugin
QMAKE_TARGET_COPYRIGHT = Copyright (c) 2018-2024 Martin Tuma QMAKE_TARGET_COPYRIGHT = Copyright (c) 2023 Martin Tuma
} }
macx { macx {
INCLUDEPATH += $$PROTOBUF/include INCLUDEPATH += $$PROTOBUF/include