mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 15:24:03 +02:00
Compare commits
No commits in common. "92faf02020d7e022e738d2dca24387ed96f0ceab" and "c6647866cbe82e5180fdbefd7b99c4d37a606c5b" have entirely different histories.
92faf02020
...
c6647866cb
212
.cirrus.yml
212
.cirrus.yml
|
@ -5,52 +5,26 @@ env:
|
||||||
CCACHE_DIR: "/tmp/ccache_dir"
|
CCACHE_DIR: "/tmp/ccache_dir"
|
||||||
CCACHE_NOHASHDIR: "1" # Debug info might contain a stale path if the build dir changes, but this is fine
|
CCACHE_NOHASHDIR: "1" # Debug info might contain a stale path if the build dir changes, but this is fine
|
||||||
CCACHE_CPP2: "yes"
|
CCACHE_CPP2: "yes"
|
||||||
|
QT_SELECT: "qt5"
|
||||||
|
|
||||||
### Task templates
|
### Task templates
|
||||||
|
|
||||||
# https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks
|
# https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks
|
||||||
filter_template: &FILTER_TEMPLATE
|
filter_template: &FILTER_TEMPLATE
|
||||||
skip: "!changesInclude('.cirrus.yml', '**.{h,hpp,cpp,c,pro,pri,ts,ui,png,qbs,js}')"
|
skip: "!changesInclude('.cirrus.yml', '**.{h,cpp,c,pro,pri,ts,ui,png}')"
|
||||||
|
|
||||||
regular_task_template: ®ULER_TASK_TEMPLATE
|
regular_task_template: ®ULER_TASK_TEMPLATE
|
||||||
<< : *FILTER_TEMPLATE
|
<< : *FILTER_TEMPLATE
|
||||||
ccache_cache:
|
ccache_cache:
|
||||||
folder: "/tmp/ccache_dir"
|
folder: "/tmp/ccache_dir"
|
||||||
|
|
||||||
regular_linux_task_template: ®ULER_LINUX_TASK_TEMPLATE
|
linux_task_template: &LINUX_TASK_TEMPLATE
|
||||||
<< : *REGULER_TASK_TEMPLATE
|
<< : *REGULER_TASK_TEMPLATE
|
||||||
env:
|
env:
|
||||||
DEBIAN_FRONTEND: "noninteractive"
|
DEBIAN_FRONTEND: "noninteractive"
|
||||||
PACKAGE_MANAGER_INSTALL: "apt-get -qq update && apt-get install -y"
|
PACKAGE_MANAGER_INSTALL: "apt-get -qq update && apt-get install -y"
|
||||||
container:
|
container:
|
||||||
cpu: 4
|
cpu: 4
|
||||||
|
|
||||||
linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE
|
|
||||||
<< : *REGULER_LINUX_TASK_TEMPLATE
|
|
||||||
env:
|
|
||||||
QT_SELECT: "qt6"
|
|
||||||
install_script:
|
|
||||||
- bash -c "$PACKAGE_MANAGER_INSTALL -y qbs qt6-base-dev qt6-l10n-tools libqt6svg6-dev qt6-base-dev-tools qmake6 qbs libxerces-c-dev poppler-utils xvfb ccache"
|
|
||||||
build_script:
|
|
||||||
- uname -a
|
|
||||||
- echo $PATH
|
|
||||||
- which qmake
|
|
||||||
- which qbs
|
|
||||||
- pwd
|
|
||||||
#- ${COMPILER} --version
|
|
||||||
- qmake --version
|
|
||||||
- qbs --version
|
|
||||||
- qbs setup-toolchains --detect
|
|
||||||
- qbs setup-qt /usr/bin/qmake6 qt6
|
|
||||||
- qbs config profiles.qt6.baseProfile ${TOOLCHAIN}
|
|
||||||
- qbs-config defaultProfile qt6
|
|
||||||
- qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt6 config:release
|
|
||||||
- xvfb-run -a qbs -p autotest-runner
|
|
||||||
|
|
||||||
linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
|
|
||||||
<< : *REGULER_LINUX_TASK_TEMPLATE
|
|
||||||
env:
|
|
||||||
QT_SELECT: "qt5"
|
|
||||||
install_script:
|
install_script:
|
||||||
- bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils xvfb ccache"
|
- bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils xvfb ccache"
|
||||||
build_script:
|
build_script:
|
||||||
|
@ -60,151 +34,85 @@ linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- pwd
|
- pwd
|
||||||
#- ${COMPILER} --version
|
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- qmake ../Valentina.pro -r -spec linux-${COMPILER} CONFIG+=noDebugSymbols CONFIG+=checkWarnings
|
- qmake ../Valentina.pro -r -spec linux-${COMPILER} CONFIG+=noDebugSymbols CONFIG+=checkWarnings
|
||||||
|
- ${COMPILER} --version
|
||||||
- make -j$(nproc)
|
- make -j$(nproc)
|
||||||
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$CIRRUS_WORKING_DIR/build/src/libs/vpropertyexplorer/bin:$CIRRUS_WORKING_DIR/build/src/libs/qmuparser/bin"
|
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$CIRRUS_WORKING_DIR/build/src/libs/vpropertyexplorer/bin:$CIRRUS_WORKING_DIR/build/src/libs/qmuparser/bin"
|
||||||
- xvfb-run -a make --silent check TESTARGS="-silent"
|
- xvfb-run -a make --silent check TESTARGS="-silent"
|
||||||
|
|
||||||
linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
|
macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
<< : *REGULER_LINUX_TASK_TEMPLATE
|
<< : *REGULER_TASK_TEMPLATE
|
||||||
|
timeout_in: 120m
|
||||||
env:
|
env:
|
||||||
QT_SELECT: "qt5"
|
ACCESS_TOKEN: ENCRYPTED[81e0b2381ffb628b73f5c94f834010e6631191e0ad03cdd0850d440fb2737a74b68131d842030f010c1bf73ab4cdc1ae]
|
||||||
|
QTDIR: "/usr/local/opt/qt5"
|
||||||
|
PATH: ${HOME}/.local/bin:$QTDIR/bin:${PATH}
|
||||||
|
# ^ add user paths
|
||||||
|
PIP_CACHE_DIR: ${HOME}/.cache/pip
|
||||||
|
DEPLOY: "true"
|
||||||
|
LDFLAGS: "-L$QTDIR/lib"
|
||||||
|
CPPFLAGS: "-I$QTDIR/include"
|
||||||
|
PKG_CONFIG_PATH: "/usr/local/opt/qt5/lib/pkgconfig"
|
||||||
|
global_homebrew_cache:
|
||||||
|
folder: "/usr/local/Homebrew"
|
||||||
|
local_homebrew_cache:
|
||||||
|
folder: "$HOME/Library/Caches/Homebrew"
|
||||||
|
pip_cache:
|
||||||
|
folder: ${PIP_CACHE_DIR}
|
||||||
install_script:
|
install_script:
|
||||||
- bash -c "$PACKAGE_MANAGER_INSTALL qbs qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils xvfb ccache"
|
- brew update > /dev/null
|
||||||
|
- brew install qt5 coreutils ccache
|
||||||
|
- chmod -R 755 /usr/local/opt/qt5/*
|
||||||
|
- python3 --version
|
||||||
|
- pip3 install --user --upgrade pip dropbox
|
||||||
build_script:
|
build_script:
|
||||||
- uname -a
|
- mkdir build
|
||||||
- echo $PATH
|
- cd build
|
||||||
- which qmake
|
|
||||||
- which qbs
|
|
||||||
- pwd
|
- pwd
|
||||||
#- ${COMPILER} --version
|
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- qbs --version
|
- qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=checkWarnings CONFIG+=noTests
|
||||||
- qbs setup-toolchains --detect
|
- ${COMPILER} --version
|
||||||
- qbs setup-qt /usr/bin/qmake qt5
|
- make -j$(nproc)
|
||||||
- qbs-config defaultProfile qt5
|
deploy_script:
|
||||||
- qbs config profiles.qt5.baseProfile ${TOOLCHAIN}
|
- pwd
|
||||||
- qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt5 config:release
|
- $CIRRUS_WORKING_DIR/scripts/cirrus-deploy.sh
|
||||||
- xvfb-run -a qbs -p autotest-runner
|
before_cache_script:
|
||||||
|
- brew cleanup
|
||||||
#macos_task_template: &MACOS_TASK_TEMPLATE
|
env:
|
||||||
# << : *REGULER_TASK_TEMPLATE
|
COMPILER: clang
|
||||||
# timeout_in: 120m
|
|
||||||
# env:
|
|
||||||
# ACCESS_TOKEN: ENCRYPTED[81e0b2381ffb628b73f5c94f834010e6631191e0ad03cdd0850d440fb2737a74b68131d842030f010c1bf73ab4cdc1ae]
|
|
||||||
# QTDIR: "/usr/local/opt/qt5"
|
|
||||||
# PATH: ${HOME}/.local/bin:$QTDIR/bin:${PATH}
|
|
||||||
# # ^ add user paths
|
|
||||||
# PIP_CACHE_DIR: ${HOME}/.cache/pip
|
|
||||||
# DEPLOY: "true"
|
|
||||||
# LDFLAGS: "-L$QTDIR/lib"
|
|
||||||
# CPPFLAGS: "-I$QTDIR/include"
|
|
||||||
# PKG_CONFIG_PATH: "/usr/local/opt/qt5/lib/pkgconfig"
|
|
||||||
# global_homebrew_cache:
|
|
||||||
# folder: "/usr/local/Homebrew"
|
|
||||||
# local_homebrew_cache:
|
|
||||||
# folder: "$HOME/Library/Caches/Homebrew"
|
|
||||||
# pip_cache:
|
|
||||||
# folder: ${PIP_CACHE_DIR}
|
|
||||||
# install_script:
|
|
||||||
# - brew update > /dev/null
|
|
||||||
# - brew install qt5 coreutils ccache
|
|
||||||
# - chmod -R 755 /usr/local/opt/qt5/*
|
|
||||||
# - python3 --version
|
|
||||||
# - pip3 install --user --upgrade pip dropbox
|
|
||||||
# build_script:
|
|
||||||
# - mkdir build
|
|
||||||
# - cd build
|
|
||||||
# - pwd
|
|
||||||
# - qmake --version
|
|
||||||
# - qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=checkWarnings CONFIG+=noTests
|
|
||||||
# - ${COMPILER} --version
|
|
||||||
# - make -j$(nproc)
|
|
||||||
# deploy_script:
|
|
||||||
# - pwd
|
|
||||||
# - $CIRRUS_WORKING_DIR/scripts/cirrus-deploy.sh
|
|
||||||
# before_cache_script:
|
|
||||||
# - brew cleanup
|
|
||||||
# env:
|
|
||||||
# COMPILER: clang
|
|
||||||
|
|
||||||
#task:
|
|
||||||
# name: 'macOS Catalina 10.15 [no tests]'
|
|
||||||
# macos_instance:
|
|
||||||
# image: catalina-xcode-11.3.1
|
|
||||||
# << : *MACOS_TASK_TEMPLATE
|
|
||||||
# env:
|
|
||||||
# PLATFORM: "macOS_10.14+"
|
|
||||||
|
|
||||||
#task:
|
|
||||||
# name: 'macOS Big Sur 11 [no tests]'
|
|
||||||
# macos_instance:
|
|
||||||
# image: big-sur-xcode-12.4
|
|
||||||
# << : *MACOS_TASK_TEMPLATE
|
|
||||||
# env:
|
|
||||||
# PLATFORM: "macOS_10.15+"
|
|
||||||
|
|
||||||
task:
|
task:
|
||||||
name: 'latest GCC [Qt5 QMake]'
|
name: 'macOS Catalina 10.15 [no tests]'
|
||||||
|
macos_instance:
|
||||||
|
image: catalina-xcode-11.3.1
|
||||||
|
<< : *MACOS_TASK_TEMPLATE
|
||||||
|
env:
|
||||||
|
PLATFORM: "macOS_10.14+"
|
||||||
|
|
||||||
|
task:
|
||||||
|
name: 'macOS Big Sur 11 [no tests]'
|
||||||
|
macos_instance:
|
||||||
|
image: big-sur-xcode-12.4
|
||||||
|
<< : *MACOS_TASK_TEMPLATE
|
||||||
|
env:
|
||||||
|
PLATFORM: "macOS_10.15+"
|
||||||
|
|
||||||
|
task:
|
||||||
|
name: 'latest GCC'
|
||||||
container:
|
container:
|
||||||
image: teeks99/gcc-ubuntu:latest
|
image: teeks99/gcc-ubuntu:latest
|
||||||
memory: 16G # Set to 16GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
memory: 16G # Set to 16GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
||||||
<< : *LINUX_QT5_QMAKE_TASK_TEMPLATE
|
<< : *LINUX_TASK_TEMPLATE
|
||||||
env:
|
env:
|
||||||
COMPILER: g++
|
COMPILER: g++
|
||||||
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
||||||
TOOLCHAIN: x86_64-pc-linux-gnu-gcc-12_2
|
|
||||||
|
|
||||||
task:
|
task:
|
||||||
name: 'latest GCC [Qt5 QBS]'
|
name: 'latest Clang'
|
||||||
container:
|
container:
|
||||||
image: teeks99/gcc-ubuntu:latest
|
image: silkeh/clang:latest
|
||||||
memory: 16G # Set to 16GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
|
||||||
<< : *LINUX_QT5_QBS_TASK_TEMPLATE
|
|
||||||
env:
|
|
||||||
COMPILER: gcc
|
|
||||||
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
|
||||||
TOOLCHAIN: x86_64-pc-linux-gnu-gcc-12_2
|
|
||||||
|
|
||||||
task:
|
|
||||||
name: 'latest GCC [Qt6]'
|
|
||||||
container:
|
|
||||||
image: teeks99/gcc-ubuntu:latest
|
|
||||||
memory: 16G # Set to 16GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
|
||||||
<< : *LINUX_QT6_TASK_TEMPLATE
|
|
||||||
env:
|
|
||||||
COMPILER: gcc
|
|
||||||
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
|
||||||
TOOLCHAIN: x86_64-pc-linux-gnu-gcc-12_2
|
|
||||||
|
|
||||||
task:
|
|
||||||
name: 'latest Clang [Qt5 QMake]'
|
|
||||||
container:
|
|
||||||
image: teeks99/clang-ubuntu:latest
|
|
||||||
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
||||||
<< : *LINUX_QT5_QMAKE_TASK_TEMPLATE
|
<< : *LINUX_TASK_TEMPLATE
|
||||||
env:
|
env:
|
||||||
COMPILER: clang
|
COMPILER: clang
|
||||||
TOOLCHAIN: clang-16
|
|
||||||
|
|
||||||
task:
|
|
||||||
name: 'latest Clang [Qt5 QBS]'
|
|
||||||
container:
|
|
||||||
image: teeks99/clang-ubuntu:latest
|
|
||||||
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
|
||||||
<< : *LINUX_QT5_QBS_TASK_TEMPLATE
|
|
||||||
env:
|
|
||||||
COMPILER: clang
|
|
||||||
TOOLCHAIN: clang-16
|
|
||||||
|
|
||||||
task:
|
|
||||||
name: 'latest Clang [Qt6]'
|
|
||||||
container:
|
|
||||||
image: teeks99/clang-ubuntu:latest
|
|
||||||
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
|
||||||
<< : *LINUX_QT6_TASK_TEMPLATE
|
|
||||||
env:
|
|
||||||
COMPILER: clang
|
|
||||||
TOOLCHAIN: clang-16
|
|
||||||
|
|
|
@ -28,9 +28,6 @@
|
||||||
#ifndef UTILS_H
|
#ifndef UTILS_H
|
||||||
#define UTILS_H
|
#define UTILS_H
|
||||||
|
|
||||||
#include <QtGlobal>
|
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
class QMimeType;
|
class QMimeType;
|
||||||
class QString;
|
class QString;
|
||||||
class QMimeType;
|
class QMimeType;
|
||||||
|
|
|
@ -40,7 +40,6 @@
|
||||||
#include <QLocale>
|
#include <QLocale>
|
||||||
#include <QLoggingCategory>
|
#include <QLoggingCategory>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
#include "../ifcdef.h"
|
#include "../ifcdef.h"
|
||||||
#include "../vmisc/def.h"
|
#include "../vmisc/def.h"
|
||||||
|
@ -52,6 +51,9 @@
|
||||||
|
|
||||||
class QDomElement;
|
class QDomElement;
|
||||||
class QDomNode;
|
class QDomNode;
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
|
template <typename T> class QVector;
|
||||||
|
#endif
|
||||||
template <typename T> class QFutureWatcher;
|
template <typename T> class QFutureWatcher;
|
||||||
|
|
||||||
Q_DECLARE_LOGGING_CATEGORY(vXML)
|
Q_DECLARE_LOGGING_CATEGORY(vXML)
|
||||||
|
|
|
@ -27,8 +27,6 @@
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
#include "vparsererrorhandler.h"
|
#include "vparsererrorhandler.h"
|
||||||
|
|
||||||
#include <QTextDocument>
|
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VParserErrorHandler::StatusMessage() const -> QString
|
auto VParserErrorHandler::StatusMessage() const -> QString
|
||||||
|
|
|
@ -28,8 +28,6 @@
|
||||||
#ifndef VPARSERERRORHANDLER_H
|
#ifndef VPARSERERRORHANDLER_H
|
||||||
#define VPARSERERRORHANDLER_H
|
#define VPARSERERRORHANDLER_H
|
||||||
|
|
||||||
#include <QtGlobal>
|
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
#include <QAbstractMessageHandler>
|
#include <QAbstractMessageHandler>
|
||||||
#include <QSourceLocation>
|
#include <QSourceLocation>
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <QLocale>
|
#include <QLocale>
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
#include "qmuparser_global.h"
|
#include "qmuparser_global.h"
|
||||||
#include "qmuparserbytecode.h"
|
#include "qmuparserbytecode.h"
|
||||||
|
@ -44,6 +43,8 @@
|
||||||
#include "qmuparsertoken.h"
|
#include "qmuparsertoken.h"
|
||||||
#include "qmuparsertokenreader.h"
|
#include "qmuparsertokenreader.h"
|
||||||
|
|
||||||
|
template <class T> class QStack;
|
||||||
|
|
||||||
namespace qmu
|
namespace qmu
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -109,7 +109,6 @@ using qmusizetype = int;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
|
||||||
#include <QTextStream>
|
|
||||||
namespace Qt
|
namespace Qt
|
||||||
{
|
{
|
||||||
static auto endl = ::endl;
|
static auto endl = ::endl;
|
||||||
|
|
|
@ -31,7 +31,8 @@
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <ciso646>
|
#include <ciso646>
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
template <class Key, class T> class QMap;
|
||||||
|
|
||||||
enum class VarMeasurement : quint8 { English=0, Metric=1 };
|
enum class VarMeasurement : quint8 { English=0, Metric=1 };
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include "../drw_base.h"
|
#include "../drw_base.h"
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
#include "../vmisc/vtextcodec.h"
|
#include "../vmisc/vtextcodec.h"
|
||||||
|
@ -17,6 +16,8 @@
|
||||||
class QStringList;
|
class QStringList;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
template <class Key, class T> class QMap;
|
||||||
|
|
||||||
class DRW_TextCodec
|
class DRW_TextCodec
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <QGraphicsPathItem>
|
#include <QGraphicsPathItem>
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
#include "../vmisc/defglobal.h"
|
#include "../vmisc/defglobal.h"
|
||||||
|
|
||||||
|
@ -46,6 +45,11 @@ class QGraphicsRectItem;
|
||||||
class QRectF;
|
class QRectF;
|
||||||
class QGraphicsItem;
|
class QGraphicsItem;
|
||||||
class QMutex;
|
class QMutex;
|
||||||
|
template <typename T> class QList;
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
|
template <typename T> class QVector;
|
||||||
|
#endif
|
||||||
|
|
||||||
class VLayoutPaper
|
class VLayoutPaper
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,14 +32,19 @@
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QRect>
|
#include <QRect>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
#include "../vmisc/def.h"
|
#include "../vmisc/def.h"
|
||||||
|
#include "../vlayout/vtextmanager.h"
|
||||||
|
|
||||||
class QGraphicsItem;
|
class QGraphicsItem;
|
||||||
class QPrinter;
|
class QPrinter;
|
||||||
struct VWatermarkData;
|
struct VWatermarkData;
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
|
template <class T> class QVector;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
struct PosterData
|
struct PosterData
|
||||||
{
|
{
|
||||||
PosterData()
|
PosterData()
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include <QSet>
|
#include <QSet>
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
#include <QFontMetrics>
|
#include <QFontMetrics>
|
||||||
#include <QLibraryInfo>
|
|
||||||
|
|
||||||
#include "defglobal.h"
|
#include "defglobal.h"
|
||||||
|
|
||||||
|
@ -339,8 +338,7 @@ inline auto VLocaleCharacter(const QChar &character) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
template <typename T>
|
inline auto DropEventPos(const QDropEvent *event) -> QPoint
|
||||||
inline auto DropEventPos(const T *event) -> QPoint
|
|
||||||
{
|
{
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
return event->position().toPoint();
|
return event->position().toPoint();
|
||||||
|
|
|
@ -28,9 +28,6 @@
|
||||||
#ifndef LITERALS_H
|
#ifndef LITERALS_H
|
||||||
#define LITERALS_H
|
#define LITERALS_H
|
||||||
|
|
||||||
#include <QtGlobal>
|
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
class QString;
|
class QString;
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
class QStringList;
|
class QStringList;
|
||||||
|
|
|
@ -35,9 +35,11 @@
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QTemporaryFile>
|
#include <QTemporaryFile>
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
class QPointF;
|
class QPointF;
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
|
template <class T> class QVector;
|
||||||
|
#endif
|
||||||
class VSAPoint;
|
class VSAPoint;
|
||||||
class VRawSAPoint;
|
class VRawSAPoint;
|
||||||
|
|
||||||
|
|
|
@ -37,9 +37,7 @@
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
#include <Qt>
|
#include <Qt>
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||||
#include <QRegularExpression>
|
|
||||||
#else
|
|
||||||
#include <QRegExp>
|
#include <QRegExp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
#include <Qt>
|
#include <Qt>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
#include "vpropertyexplorer_global.h"
|
#include "vpropertyexplorer_global.h"
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
|
||||||
|
@ -45,6 +44,8 @@
|
||||||
|
|
||||||
#include "vpropertydef.h"
|
#include "vpropertydef.h"
|
||||||
|
|
||||||
|
template <typename T> class QList;
|
||||||
|
|
||||||
namespace VPE
|
namespace VPE
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -28,11 +28,8 @@
|
||||||
|
|
||||||
#include "vpropertydef.h"
|
#include "vpropertydef.h"
|
||||||
|
|
||||||
#include <QChar>
|
|
||||||
#include <QLocale>
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocalePositiveSign(const QLocale &locale) -> QChar
|
QChar VPELocalePositiveSign(const QLocale &locale)
|
||||||
{
|
{
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
const QString sign = locale.positiveSign();
|
const QString sign = locale.positiveSign();
|
||||||
|
@ -48,7 +45,7 @@ auto VPELocalePositiveSign(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleNegativeSign(const QLocale &locale) -> QChar
|
QChar VPELocaleNegativeSign(const QLocale &locale)
|
||||||
{
|
{
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
const QString sign = locale.negativeSign();
|
const QString sign = locale.negativeSign();
|
||||||
|
@ -64,7 +61,7 @@ auto VPELocaleNegativeSign(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleSign0(const QLocale &locale) -> QChar
|
QChar VPELocaleSign0(const QLocale &locale)
|
||||||
{
|
{
|
||||||
const QString sign = locale.toString(0);
|
const QString sign = locale.toString(0);
|
||||||
if (sign.size() == 1)
|
if (sign.size() == 1)
|
||||||
|
@ -80,7 +77,7 @@ auto VPELocaleSign0(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleSign1(const QLocale &locale) -> QChar
|
QChar VPELocaleSign1(const QLocale &locale)
|
||||||
{
|
{
|
||||||
const QString sign = locale.toString(1);
|
const QString sign = locale.toString(1);
|
||||||
if (sign.size() == 1)
|
if (sign.size() == 1)
|
||||||
|
@ -96,7 +93,7 @@ auto VPELocaleSign1(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleSign2(const QLocale &locale) -> QChar
|
QChar VPELocaleSign2(const QLocale &locale)
|
||||||
{
|
{
|
||||||
const QString sign = locale.toString(2);
|
const QString sign = locale.toString(2);
|
||||||
if (sign.size() == 1)
|
if (sign.size() == 1)
|
||||||
|
@ -112,7 +109,7 @@ auto VPELocaleSign2(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleSign3(const QLocale &locale) -> QChar
|
QChar VPELocaleSign3(const QLocale &locale)
|
||||||
{
|
{
|
||||||
const QString sign = locale.toString(3);
|
const QString sign = locale.toString(3);
|
||||||
if (sign.size() == 1)
|
if (sign.size() == 1)
|
||||||
|
@ -128,7 +125,7 @@ auto VPELocaleSign3(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleSign4(const QLocale &locale) -> QChar
|
QChar VPELocaleSign4(const QLocale &locale)
|
||||||
{
|
{
|
||||||
const QString sign = locale.toString(4);
|
const QString sign = locale.toString(4);
|
||||||
if (sign.size() == 1)
|
if (sign.size() == 1)
|
||||||
|
@ -144,7 +141,7 @@ auto VPELocaleSign4(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleSign5(const QLocale &locale) -> QChar
|
QChar VPELocaleSign5(const QLocale &locale)
|
||||||
{
|
{
|
||||||
const QString sign = locale.toString(5);
|
const QString sign = locale.toString(5);
|
||||||
if (sign.size() == 1)
|
if (sign.size() == 1)
|
||||||
|
@ -160,7 +157,7 @@ auto VPELocaleSign5(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleSign6(const QLocale &locale) -> QChar
|
QChar VPELocaleSign6(const QLocale &locale)
|
||||||
{
|
{
|
||||||
const QString sign = locale.toString(6);
|
const QString sign = locale.toString(6);
|
||||||
if (sign.size() == 1)
|
if (sign.size() == 1)
|
||||||
|
@ -176,7 +173,7 @@ auto VPELocaleSign6(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleSign7(const QLocale &locale) -> QChar
|
QChar VPELocaleSign7(const QLocale &locale)
|
||||||
{
|
{
|
||||||
const QString sign = locale.toString(7);
|
const QString sign = locale.toString(7);
|
||||||
if (sign.size() == 1)
|
if (sign.size() == 1)
|
||||||
|
@ -192,7 +189,7 @@ auto VPELocaleSign7(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleSign8(const QLocale &locale) -> QChar
|
QChar VPELocaleSign8(const QLocale &locale)
|
||||||
{
|
{
|
||||||
const QString sign = locale.toString(8);
|
const QString sign = locale.toString(8);
|
||||||
if (sign.size() == 1)
|
if (sign.size() == 1)
|
||||||
|
@ -208,7 +205,7 @@ auto VPELocaleSign8(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleSign9(const QLocale &locale) -> QChar
|
QChar VPELocaleSign9(const QLocale &locale)
|
||||||
{
|
{
|
||||||
const QString sign = locale.toString(9);
|
const QString sign = locale.toString(9);
|
||||||
if (sign.size() == 1)
|
if (sign.size() == 1)
|
||||||
|
@ -224,7 +221,7 @@ auto VPELocaleSign9(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleExpUpper(const QLocale &locale) -> QChar
|
QChar VPELocaleExpUpper(const QLocale &locale)
|
||||||
{
|
{
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
const QString sign = locale.exponential();
|
const QString sign = locale.exponential();
|
||||||
|
@ -240,7 +237,7 @@ auto VPELocaleExpUpper(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleExpLower(const QLocale &locale) -> QChar
|
QChar VPELocaleExpLower(const QLocale &locale)
|
||||||
{
|
{
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
const QString sign = locale.exponential();
|
const QString sign = locale.exponential();
|
||||||
|
@ -256,7 +253,7 @@ auto VPELocaleExpLower(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleDecimalPoint(const QLocale &locale) -> QChar
|
QChar VPELocaleDecimalPoint(const QLocale &locale)
|
||||||
{
|
{
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
const QString sign = locale.decimalPoint();
|
const QString sign = locale.decimalPoint();
|
||||||
|
@ -272,7 +269,7 @@ auto VPELocaleDecimalPoint(const QLocale &locale) -> QChar
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
auto VPELocaleGroupSeparator(const QLocale &locale) -> QChar
|
QChar VPELocaleGroupSeparator(const QLocale &locale)
|
||||||
{
|
{
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
const QString sign = locale.groupSeparator();
|
const QString sign = locale.groupSeparator();
|
||||||
|
|
|
@ -37,9 +37,6 @@ using vpesizetype = qsizetype;
|
||||||
using vpesizetype = int;
|
using vpesizetype = int;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
class QLocale;
|
|
||||||
class QChar;
|
|
||||||
|
|
||||||
VPROPERTYEXPLORERSHARED_EXPORT auto VPELocalePositiveSign(const QLocale &locale) -> QChar;
|
VPROPERTYEXPLORERSHARED_EXPORT auto VPELocalePositiveSign(const QLocale &locale) -> QChar;
|
||||||
VPROPERTYEXPLORERSHARED_EXPORT auto VPELocaleNegativeSign(const QLocale &locale) -> QChar;
|
VPROPERTYEXPLORERSHARED_EXPORT auto VPELocaleNegativeSign(const QLocale &locale) -> QChar;
|
||||||
VPROPERTYEXPLORERSHARED_EXPORT auto VPELocaleSign0(const QLocale &locale) -> QChar;
|
VPROPERTYEXPLORERSHARED_EXPORT auto VPELocaleSign0(const QLocale &locale) -> QChar;
|
||||||
|
|
|
@ -25,11 +25,13 @@
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
#include "vproperty.h"
|
#include "vproperty.h"
|
||||||
#include "vpropertyexplorer_global.h"
|
#include "vpropertyexplorer_global.h"
|
||||||
|
|
||||||
|
template <class Key, class T> class QMap;
|
||||||
|
template <typename T> class QList;
|
||||||
|
|
||||||
namespace VPE
|
namespace VPE
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -37,13 +37,16 @@
|
||||||
#include <QJsonArray>
|
#include <QJsonArray>
|
||||||
#include <qtestcase.h>
|
#include <qtestcase.h>
|
||||||
#include <typeinfo>
|
#include <typeinfo>
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
#include "../vgeometry/vpointf.h"
|
#include "../vgeometry/vpointf.h"
|
||||||
#include "../vlayout/vsapoint.h"
|
#include "../vlayout/vsapoint.h"
|
||||||
#include "../vlayout/vrawsapoint.h"
|
#include "../vlayout/vrawsapoint.h"
|
||||||
#include "../ifc/exception/vexception.h"
|
#include "../ifc/exception/vexception.h"
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
|
template <class T> class QVector;
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <ciso646>
|
#include <ciso646>
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
|
|
|
@ -44,7 +44,6 @@
|
||||||
#include <Qt>
|
#include <Qt>
|
||||||
#include <QtDebug>
|
#include <QtDebug>
|
||||||
#include <QtMath>
|
#include <QtMath>
|
||||||
#include <QtCore/qcontainerfwd.h>
|
|
||||||
|
|
||||||
#include "../vpatterndb/calculator.h"
|
#include "../vpatterndb/calculator.h"
|
||||||
#include "../vpatterndb/vtranslatevars.h"
|
#include "../vpatterndb/vtranslatevars.h"
|
||||||
|
@ -56,6 +55,8 @@
|
||||||
#include "../vwidgets/scalesceneitems.h"
|
#include "../vwidgets/scalesceneitems.h"
|
||||||
#include "../vwidgets/global.h"
|
#include "../vwidgets/global.h"
|
||||||
|
|
||||||
|
template <class K, class V> class QHash;
|
||||||
|
|
||||||
QT_WARNING_PUSH
|
QT_WARNING_PUSH
|
||||||
QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
|
QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
|
||||||
QT_WARNING_DISABLE_INTEL(1418)
|
QT_WARNING_DISABLE_INTEL(1418)
|
||||||
|
|
|
@ -75,8 +75,7 @@ SOURCES += \
|
||||||
tst_readval.cpp \
|
tst_readval.cpp \
|
||||||
tst_vtranslatevars.cpp \
|
tst_vtranslatevars.cpp \
|
||||||
tst_vabstractpiece.cpp \
|
tst_vabstractpiece.cpp \
|
||||||
tst_vtooluniondetails.cpp \
|
tst_vtooluniondetails.cpp
|
||||||
tst_xsdschema.cpp
|
|
||||||
|
|
||||||
*msvc*:SOURCES += stable.cpp
|
*msvc*:SOURCES += stable.cpp
|
||||||
|
|
||||||
|
@ -105,8 +104,7 @@ HEADERS += \
|
||||||
tst_readval.h \
|
tst_readval.h \
|
||||||
tst_vtranslatevars.h \
|
tst_vtranslatevars.h \
|
||||||
tst_vabstractpiece.h \
|
tst_vabstractpiece.h \
|
||||||
tst_vtooluniondetails.h \
|
tst_vtooluniondetails.h
|
||||||
tst_xsdschema.h
|
|
||||||
|
|
||||||
# Set using ccache. Function enable_ccache() defined in common.pri.
|
# Set using ccache. Function enable_ccache() defined in common.pri.
|
||||||
$$enable_ccache()
|
$$enable_ccache()
|
||||||
|
|
|
@ -35,8 +35,6 @@
|
||||||
#include "../ifc/xml/vwatermarkconverter.h"
|
#include "../ifc/xml/vwatermarkconverter.h"
|
||||||
#include "../ifc/xml/vparsererrorhandler.h"
|
#include "../ifc/xml/vparsererrorhandler.h"
|
||||||
|
|
||||||
#include <QTest>
|
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
#include <xercesc/parsers/XercesDOMParser.hpp>
|
#include <xercesc/parsers/XercesDOMParser.hpp>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue