mirror of
https://github.com/tumic0/QtPBFImagePlugin.git
synced 2025-07-24 07:44:25 +02:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
73f2b246ea | |||
5fad81c3a6 | |||
eaa5a1e14e | |||
7f357e7559 |
@ -1,4 +1,4 @@
|
|||||||
version: 4.2.{build}
|
version: 4.3.{build}
|
||||||
|
|
||||||
configuration:
|
configuration:
|
||||||
- Release
|
- Release
|
||||||
@ -9,8 +9,10 @@ image:
|
|||||||
environment:
|
environment:
|
||||||
VCPKGDIR: C:\tools\vcpkg\installed\x64-windows-static-md-release
|
VCPKGDIR: C:\tools\vcpkg\installed\x64-windows-static-md-release
|
||||||
matrix:
|
matrix:
|
||||||
- QTDIR: C:\Qt\5.15\msvc2019_64
|
- job_name: Qt5
|
||||||
- QTDIR: C:\Qt\6.8\msvc2022_64
|
QTDIR: C:\Qt\5.15\msvc2019_64
|
||||||
|
- job_name: Qt6
|
||||||
|
QTDIR: C:\Qt\6.8\msvc2022_64
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- cmd: |-
|
- cmd: |-
|
||||||
@ -26,6 +28,7 @@ build_script:
|
|||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: release\pbf4.dll
|
- path: release\pbf4.dll
|
||||||
|
name: pbf4.dll
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
- C:\tools\vcpkg\installed\
|
- C:\tools\vcpkg\installed\
|
||||||
|
2
.github/workflows/osx.yml
vendored
2
.github/workflows/osx.yml
vendored
@ -15,7 +15,7 @@ jobs:
|
|||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
uses: jurplel/install-qt-action@v4
|
uses: jurplel/install-qt-action@v4
|
||||||
with:
|
with:
|
||||||
version: '6.8.2'
|
version: '6.9.1'
|
||||||
- name: Configure build
|
- name: Configure build
|
||||||
run: qmake pbfplugin.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64h arm64"
|
run: qmake pbfplugin.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64h arm64"
|
||||||
- name: Build project
|
- name: Build project
|
||||||
|
@ -2,7 +2,7 @@ TARGET = pbf
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
CONFIG += plugin
|
CONFIG += plugin
|
||||||
QT += gui
|
QT += gui
|
||||||
VERSION = 4.2
|
VERSION = 4.3
|
||||||
|
|
||||||
HEADERS += src/pbfhandler.h \
|
HEADERS += src/pbfhandler.h \
|
||||||
src/data.h \
|
src/data.h \
|
||||||
|
@ -3610,6 +3610,18 @@
|
|||||||
"<=",
|
"<=",
|
||||||
"ref_length",
|
"ref_length",
|
||||||
6
|
6
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"!=",
|
||||||
|
"subclass",
|
||||||
|
"junction"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"in",
|
||||||
|
"class",
|
||||||
|
"motorway",
|
||||||
|
"primary",
|
||||||
|
"secondary"
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
"layout": {
|
"layout": {
|
||||||
|
Reference in New Issue
Block a user