Compare commits

...

7 commits

Author SHA1 Message Date
Roman Telezhynskyi 3ef14942d7 Copy paste error. 2023-02-26 13:13:38 +02:00
Roman Telezhynskyi 4991e5b866 unexpected EOF while looking for matching `}' 2023-02-26 13:00:40 +02:00
Roman Telezhynskyi 5ae7ef7803 Try Qt 6.4 with GCC 8.1.
See issue QTBUG-103573.
2023-02-26 12:30:12 +02:00
Roman Telezhynskyi 9d16ffb016 Fix calling. 2023-02-26 11:22:36 +02:00
Roman Telezhynskyi fbf90fc109 Check if msvc will work without stable.cpp. 2023-02-26 11:22:36 +02:00
Roman Telezhynskyi e0692bdc76 Avoid using environment variables when defining them. 2023-02-26 10:42:24 +02:00
Roman Telezhynskyi 718f8bf75a Fix build on Windows. 2023-02-26 10:30:56 +02:00
3 changed files with 15 additions and 14 deletions

View file

@ -49,7 +49,7 @@ environment:
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ENABLE_PCH: false ENABLE_PCH: false
GCC_VERSION: 11.2 GCC_VERSION: 11.2
MINGW_PATH: C:\Qt\Tools\mingw1120_64\bin MINGW_PATH: C:\Qt\Tools\mingw810_64\bin
ARCH: x64 ARCH: x64
PYTHON: "C:\\Python311-x64" PYTHON: "C:\\Python311-x64"
PLATFORM: "Windows10+" PLATFORM: "Windows10+"
@ -84,7 +84,7 @@ environment:
- job_name: MacOS_12_Qt_6_4 (multibundle) - job_name: MacOS_12_Qt_6_4 (multibundle)
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
COMPILER: clang COMPILER: clang
QT: ${HOME}/Qt/6.4/macos QT: Qt/6.4/macos
QT_VERSION: Qt6_4 QT_VERSION: Qt6_4
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
@ -98,7 +98,7 @@ environment:
- job_name: MacOS_12_Qt_6_4 (singlebundle) - job_name: MacOS_12_Qt_6_4 (singlebundle)
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
COMPILER: clang COMPILER: clang
QT: ${HOME}/Qt/6.4/macos QT: Qt/6.4/macos
QT_VERSION: Qt6_4 QT_VERSION: Qt6_4
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
@ -112,7 +112,7 @@ environment:
- job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle) - job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
COMPILER: clang COMPILER: clang
QT: ${HOME}/Qt/5.15/clang_64 QT: Qt/5.15/clang_64
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
@ -126,7 +126,7 @@ environment:
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle) - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
COMPILER: clang COMPILER: clang
QT: ${HOME}/Qt/5.15/clang_64 QT: Qt/5.15/clang_64
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
@ -228,7 +228,7 @@ environment:
- job_name: MacOS_10_15_Qt_5_15 (make) - job_name: MacOS_10_15_Qt_5_15 (make)
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
COMPILER: clang COMPILER: clang
QT: ${HOME}/Qt/5.15/clang_64 QT: Qt/5.15/clang_64
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "make" BUILD_SYSTEM: "make"
ARCH: x64 ARCH: x64
@ -442,10 +442,10 @@ for:
} }
} elseif ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") { } elseif ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") {
if ($env:ARCH -eq "x64") { if ($env:ARCH -eq "x64") {
& "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd /x64" '& "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64'
& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86_amd64" '& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64'
} else { } else {
& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86" '& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86'
} }
} }
} }
@ -511,7 +511,7 @@ for:
- rm '/usr/local/bin/cpack' - rm '/usr/local/bin/cpack'
- rm '/usr/local/bin/ctest' - rm '/usr/local/bin/ctest'
- brew install --force coreutils qbs cmake - brew install --force coreutils qbs cmake
- export QTDIR="$QT" - export QTDIR="${HOME}/${QT}"
- export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:$PATH" - export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:$PATH"
- echo $PATH - echo $PATH
- python3 --version - python3 --version
@ -543,7 +543,7 @@ for:
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false
deploy_script: deploy_script:
- CIRRUS_WORKING_DIR=${APPVEYOR_BUILD_FOLDER CIRRUS_CHANGE_IN_REPO=${APPVEYOR_REPO_COMMIT} CIRRUS_BRANCH=${APPVEYOR_REPO_BRANCH} ${APPVEYOR_BUILD_FOLDER}/scripts/cirrus-deploy.sh - CIRRUS_WORKING_DIR=${APPVEYOR_BUILD_FOLDER} CIRRUS_CHANGE_IN_REPO=${APPVEYOR_REPO_COMMIT} CIRRUS_BRANCH=${APPVEYOR_REPO_BRANCH} ${APPVEYOR_BUILD_FOLDER}/scripts/cirrus-deploy.sh
- -
matrix: matrix:
@ -551,7 +551,7 @@ for:
- job_name: MacOS_10_15_Qt_5_15 (make) - job_name: MacOS_10_15_Qt_5_15 (make)
init: init:
- export QTDIR="$QT" - export QTDIR="${HOME}/${QT}"
- export PATH="$QTDIR/bin:$PATH" - export PATH="$QTDIR/bin:$PATH"
- echo $PATH - echo $PATH
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app' - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'

View file

@ -38,8 +38,8 @@ Library {
prefix: product.sourceDirectory + "/" prefix: product.sourceDirectory + "/"
files: { files: {
var files = ["stable.h"]; var files = ["stable.h"];
if (qbs.toolchain.contains("msvc")) // if (qbs.toolchain.contains("msvc"))
files.push("stable.cpp") // files.push("stable.cpp")
return files; return files;
} }
fileTags: ["cpp_pch_src"] fileTags: ["cpp_pch_src"]

View file

@ -20,6 +20,7 @@
#include <list> #include <list>
#include <QtGlobal> #include <QtGlobal>
#include "drw_base.h" #include "drw_base.h"
#include <algorithm>
class dxfReader; class dxfReader;
class DRW_Polyline; class DRW_Polyline;