mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-08 01:54:37 +02:00
Compare commits
16 commits
c6647866cb
...
92faf02020
Author | SHA1 | Date | |
---|---|---|---|
|
92faf02020 | ||
|
11165c566a | ||
|
f86ba23f92 | ||
|
59f78a4f1f | ||
|
02781040ed | ||
|
d726f7206f | ||
|
8888164f47 | ||
|
82cb2d83ab | ||
|
5680bbe463 | ||
|
d541823020 | ||
|
db8c776e36 | ||
|
04d2a1c631 | ||
|
cca8a687a2 | ||
|
a839c8e7ed | ||
|
484e76b84a | ||
|
660a1acf6f |
212
.cirrus.yml
212
.cirrus.yml
|
@ -5,26 +5,52 @@ env:
|
|||
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_CPP2: "yes"
|
||||
QT_SELECT: "qt5"
|
||||
|
||||
### Task templates
|
||||
|
||||
# https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks
|
||||
filter_template: &FILTER_TEMPLATE
|
||||
skip: "!changesInclude('.cirrus.yml', '**.{h,cpp,c,pro,pri,ts,ui,png}')"
|
||||
skip: "!changesInclude('.cirrus.yml', '**.{h,hpp,cpp,c,pro,pri,ts,ui,png,qbs,js}')"
|
||||
|
||||
regular_task_template: ®ULER_TASK_TEMPLATE
|
||||
<< : *FILTER_TEMPLATE
|
||||
ccache_cache:
|
||||
folder: "/tmp/ccache_dir"
|
||||
|
||||
linux_task_template: &LINUX_TASK_TEMPLATE
|
||||
regular_linux_task_template: ®ULER_LINUX_TASK_TEMPLATE
|
||||
<< : *REGULER_TASK_TEMPLATE
|
||||
env:
|
||||
DEBIAN_FRONTEND: "noninteractive"
|
||||
PACKAGE_MANAGER_INSTALL: "apt-get -qq update && apt-get install -y"
|
||||
container:
|
||||
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:
|
||||
- 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:
|
||||
|
@ -34,85 +60,151 @@ linux_task_template: &LINUX_TASK_TEMPLATE
|
|||
- mkdir build
|
||||
- cd build
|
||||
- pwd
|
||||
#- ${COMPILER} --version
|
||||
- qmake --version
|
||||
- qmake ../Valentina.pro -r -spec linux-${COMPILER} CONFIG+=noDebugSymbols CONFIG+=checkWarnings
|
||||
- ${COMPILER} --version
|
||||
- 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"
|
||||
- xvfb-run -a make --silent check TESTARGS="-silent"
|
||||
|
||||
macos_task_template: &MACOS_TASK_TEMPLATE
|
||||
<< : *REGULER_TASK_TEMPLATE
|
||||
timeout_in: 120m
|
||||
linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
|
||||
<< : *REGULER_LINUX_TASK_TEMPLATE
|
||||
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}
|
||||
QT_SELECT: "qt5"
|
||||
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
|
||||
- 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"
|
||||
build_script:
|
||||
- mkdir build
|
||||
- cd build
|
||||
- uname -a
|
||||
- echo $PATH
|
||||
- which qmake
|
||||
- which qbs
|
||||
- pwd
|
||||
#- ${COMPILER} --version
|
||||
- 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
|
||||
- qbs --version
|
||||
- qbs setup-toolchains --detect
|
||||
- qbs setup-qt /usr/bin/qmake qt5
|
||||
- qbs-config defaultProfile qt5
|
||||
- qbs config profiles.qt5.baseProfile ${TOOLCHAIN}
|
||||
- qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt5 config:release
|
||||
- xvfb-run -a qbs -p autotest-runner
|
||||
|
||||
#macos_task_template: &MACOS_TASK_TEMPLATE
|
||||
# << : *REGULER_TASK_TEMPLATE
|
||||
# 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:
|
||||
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'
|
||||
name: 'latest GCC [Qt5 QMake]'
|
||||
container:
|
||||
image: teeks99/gcc-ubuntu:latest
|
||||
memory: 16G # Set to 16GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
||||
<< : *LINUX_TASK_TEMPLATE
|
||||
<< : *LINUX_QT5_QMAKE_TASK_TEMPLATE
|
||||
env:
|
||||
COMPILER: g++
|
||||
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'
|
||||
name: 'latest GCC [Qt5 QBS]'
|
||||
container:
|
||||
image: silkeh/clang:latest
|
||||
image: teeks99/gcc-ubuntu: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
|
||||
<< : *LINUX_TASK_TEMPLATE
|
||||
<< : *LINUX_QT5_QMAKE_TASK_TEMPLATE
|
||||
env:
|
||||
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,6 +28,9 @@
|
|||
#ifndef UTILS_H
|
||||
#define UTILS_H
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
class QMimeType;
|
||||
class QString;
|
||||
class QMimeType;
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
#include <QLocale>
|
||||
#include <QLoggingCategory>
|
||||
#include <functional>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
#include "../ifcdef.h"
|
||||
#include "../vmisc/def.h"
|
||||
|
@ -51,9 +52,6 @@
|
|||
|
||||
class QDomElement;
|
||||
class QDomNode;
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
template <typename T> class QVector;
|
||||
#endif
|
||||
template <typename T> class QFutureWatcher;
|
||||
|
||||
Q_DECLARE_LOGGING_CATEGORY(vXML)
|
||||
|
|
|
@ -27,6 +27,8 @@
|
|||
*************************************************************************/
|
||||
#include "vparsererrorhandler.h"
|
||||
|
||||
#include <QTextDocument>
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
auto VParserErrorHandler::StatusMessage() const -> QString
|
||||
|
|
|
@ -28,6 +28,8 @@
|
|||
#ifndef VPARSERERRORHANDLER_H
|
||||
#define VPARSERERRORHANDLER_H
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
#include <QAbstractMessageHandler>
|
||||
#include <QSourceLocation>
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
#include <memory>
|
||||
#include <string>
|
||||
#include <QLocale>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
#include "qmuparser_global.h"
|
||||
#include "qmuparserbytecode.h"
|
||||
|
@ -43,8 +44,6 @@
|
|||
#include "qmuparsertoken.h"
|
||||
#include "qmuparsertokenreader.h"
|
||||
|
||||
template <class T> class QStack;
|
||||
|
||||
namespace qmu
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -109,6 +109,7 @@ using qmusizetype = int;
|
|||
#endif
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
|
||||
#include <QTextStream>
|
||||
namespace Qt
|
||||
{
|
||||
static auto endl = ::endl;
|
||||
|
|
|
@ -31,8 +31,7 @@
|
|||
|
||||
#include <QtGlobal>
|
||||
#include <ciso646>
|
||||
|
||||
template <class Key, class T> class QMap;
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
enum class VarMeasurement : quint8 { English=0, Metric=1 };
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
#include <string>
|
||||
#include <QtGlobal>
|
||||
#include "../drw_base.h"
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
#include "../vmisc/vtextcodec.h"
|
||||
|
@ -16,8 +17,6 @@
|
|||
class QStringList;
|
||||
#endif
|
||||
|
||||
template <class Key, class T> class QMap;
|
||||
|
||||
class DRW_TextCodec
|
||||
{
|
||||
public:
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
#include <QtGlobal>
|
||||
#include <atomic>
|
||||
#include <QGraphicsPathItem>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
#include "../vmisc/defglobal.h"
|
||||
|
||||
|
@ -45,11 +46,6 @@ class QGraphicsRectItem;
|
|||
class QRectF;
|
||||
class QGraphicsItem;
|
||||
class QMutex;
|
||||
template <typename T> class QList;
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
template <typename T> class QVector;
|
||||
#endif
|
||||
|
||||
class VLayoutPaper
|
||||
{
|
||||
|
|
|
@ -32,19 +32,14 @@
|
|||
#include <QCoreApplication>
|
||||
#include <QRect>
|
||||
#include <QtGlobal>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
#include "../vmisc/def.h"
|
||||
#include "../vlayout/vtextmanager.h"
|
||||
|
||||
class QGraphicsItem;
|
||||
class QPrinter;
|
||||
struct VWatermarkData;
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
template <class T> class QVector;
|
||||
#endif
|
||||
|
||||
|
||||
struct PosterData
|
||||
{
|
||||
PosterData()
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include <QSet>
|
||||
#include <QVector>
|
||||
#include <QFontMetrics>
|
||||
#include <QLibraryInfo>
|
||||
|
||||
#include "defglobal.h"
|
||||
|
||||
|
@ -338,7 +339,8 @@ inline auto VLocaleCharacter(const QChar &character) -> QChar
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
inline auto DropEventPos(const QDropEvent *event) -> QPoint
|
||||
template <typename T>
|
||||
inline auto DropEventPos(const T *event) -> QPoint
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
return event->position().toPoint();
|
||||
|
|
|
@ -28,6 +28,9 @@
|
|||
#ifndef LITERALS_H
|
||||
#define LITERALS_H
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
class QString;
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
class QStringList;
|
||||
|
|
|
@ -35,11 +35,9 @@
|
|||
#include <QString>
|
||||
#include <QTemporaryFile>
|
||||
#include <QTextStream>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
class QPointF;
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
template <class T> class QVector;
|
||||
#endif
|
||||
class VSAPoint;
|
||||
class VRawSAPoint;
|
||||
|
||||
|
|
|
@ -37,7 +37,9 @@
|
|||
#include <QUrl>
|
||||
#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>
|
||||
#endif
|
||||
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
#include <QVariant>
|
||||
#include <Qt>
|
||||
#include <QtGlobal>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
#include "vpropertyexplorer_global.h"
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
|
||||
|
@ -44,8 +45,6 @@
|
|||
|
||||
#include "vpropertydef.h"
|
||||
|
||||
template <typename T> class QList;
|
||||
|
||||
namespace VPE
|
||||
{
|
||||
|
||||
|
|
|
@ -28,8 +28,11 @@
|
|||
|
||||
#include "vpropertydef.h"
|
||||
|
||||
#include <QChar>
|
||||
#include <QLocale>
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocalePositiveSign(const QLocale &locale)
|
||||
auto VPELocalePositiveSign(const QLocale &locale) -> QChar
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
const QString sign = locale.positiveSign();
|
||||
|
@ -45,7 +48,7 @@ QChar VPELocalePositiveSign(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleNegativeSign(const QLocale &locale)
|
||||
auto VPELocaleNegativeSign(const QLocale &locale) -> QChar
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
const QString sign = locale.negativeSign();
|
||||
|
@ -61,7 +64,7 @@ QChar VPELocaleNegativeSign(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleSign0(const QLocale &locale)
|
||||
auto VPELocaleSign0(const QLocale &locale) -> QChar
|
||||
{
|
||||
const QString sign = locale.toString(0);
|
||||
if (sign.size() == 1)
|
||||
|
@ -77,7 +80,7 @@ QChar VPELocaleSign0(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleSign1(const QLocale &locale)
|
||||
auto VPELocaleSign1(const QLocale &locale) -> QChar
|
||||
{
|
||||
const QString sign = locale.toString(1);
|
||||
if (sign.size() == 1)
|
||||
|
@ -93,7 +96,7 @@ QChar VPELocaleSign1(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleSign2(const QLocale &locale)
|
||||
auto VPELocaleSign2(const QLocale &locale) -> QChar
|
||||
{
|
||||
const QString sign = locale.toString(2);
|
||||
if (sign.size() == 1)
|
||||
|
@ -109,7 +112,7 @@ QChar VPELocaleSign2(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleSign3(const QLocale &locale)
|
||||
auto VPELocaleSign3(const QLocale &locale) -> QChar
|
||||
{
|
||||
const QString sign = locale.toString(3);
|
||||
if (sign.size() == 1)
|
||||
|
@ -125,7 +128,7 @@ QChar VPELocaleSign3(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleSign4(const QLocale &locale)
|
||||
auto VPELocaleSign4(const QLocale &locale) -> QChar
|
||||
{
|
||||
const QString sign = locale.toString(4);
|
||||
if (sign.size() == 1)
|
||||
|
@ -141,7 +144,7 @@ QChar VPELocaleSign4(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleSign5(const QLocale &locale)
|
||||
auto VPELocaleSign5(const QLocale &locale) -> QChar
|
||||
{
|
||||
const QString sign = locale.toString(5);
|
||||
if (sign.size() == 1)
|
||||
|
@ -157,7 +160,7 @@ QChar VPELocaleSign5(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleSign6(const QLocale &locale)
|
||||
auto VPELocaleSign6(const QLocale &locale) -> QChar
|
||||
{
|
||||
const QString sign = locale.toString(6);
|
||||
if (sign.size() == 1)
|
||||
|
@ -173,7 +176,7 @@ QChar VPELocaleSign6(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleSign7(const QLocale &locale)
|
||||
auto VPELocaleSign7(const QLocale &locale) -> QChar
|
||||
{
|
||||
const QString sign = locale.toString(7);
|
||||
if (sign.size() == 1)
|
||||
|
@ -189,7 +192,7 @@ QChar VPELocaleSign7(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleSign8(const QLocale &locale)
|
||||
auto VPELocaleSign8(const QLocale &locale) -> QChar
|
||||
{
|
||||
const QString sign = locale.toString(8);
|
||||
if (sign.size() == 1)
|
||||
|
@ -205,7 +208,7 @@ QChar VPELocaleSign8(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleSign9(const QLocale &locale)
|
||||
auto VPELocaleSign9(const QLocale &locale) -> QChar
|
||||
{
|
||||
const QString sign = locale.toString(9);
|
||||
if (sign.size() == 1)
|
||||
|
@ -221,7 +224,7 @@ QChar VPELocaleSign9(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleExpUpper(const QLocale &locale)
|
||||
auto VPELocaleExpUpper(const QLocale &locale) -> QChar
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
const QString sign = locale.exponential();
|
||||
|
@ -237,7 +240,7 @@ QChar VPELocaleExpUpper(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleExpLower(const QLocale &locale)
|
||||
auto VPELocaleExpLower(const QLocale &locale) -> QChar
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
const QString sign = locale.exponential();
|
||||
|
@ -253,7 +256,7 @@ QChar VPELocaleExpLower(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleDecimalPoint(const QLocale &locale)
|
||||
auto VPELocaleDecimalPoint(const QLocale &locale) -> QChar
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
const QString sign = locale.decimalPoint();
|
||||
|
@ -269,7 +272,7 @@ QChar VPELocaleDecimalPoint(const QLocale &locale)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
QChar VPELocaleGroupSeparator(const QLocale &locale)
|
||||
auto VPELocaleGroupSeparator(const QLocale &locale) -> QChar
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
const QString sign = locale.groupSeparator();
|
||||
|
|
|
@ -37,6 +37,9 @@ using vpesizetype = qsizetype;
|
|||
using vpesizetype = int;
|
||||
#endif
|
||||
|
||||
class QLocale;
|
||||
class QChar;
|
||||
|
||||
VPROPERTYEXPLORERSHARED_EXPORT auto VPELocalePositiveSign(const QLocale &locale) -> QChar;
|
||||
VPROPERTYEXPLORERSHARED_EXPORT auto VPELocaleNegativeSign(const QLocale &locale) -> QChar;
|
||||
VPROPERTYEXPLORERSHARED_EXPORT auto VPELocaleSign0(const QLocale &locale) -> QChar;
|
||||
|
|
|
@ -25,13 +25,11 @@
|
|||
#include <QMap>
|
||||
#include <QString>
|
||||
#include <QtGlobal>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
#include "vproperty.h"
|
||||
#include "vpropertyexplorer_global.h"
|
||||
|
||||
template <class Key, class T> class QMap;
|
||||
template <typename T> class QList;
|
||||
|
||||
namespace VPE
|
||||
{
|
||||
|
||||
|
|
|
@ -37,16 +37,13 @@
|
|||
#include <QJsonArray>
|
||||
#include <qtestcase.h>
|
||||
#include <typeinfo>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
#include "../vgeometry/vpointf.h"
|
||||
#include "../vlayout/vsapoint.h"
|
||||
#include "../vlayout/vrawsapoint.h"
|
||||
#include "../ifc/exception/vexception.h"
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
template <class T> class QVector;
|
||||
#endif
|
||||
|
||||
#include <ciso646>
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
#include <Qt>
|
||||
#include <QtDebug>
|
||||
#include <QtMath>
|
||||
#include <QtCore/qcontainerfwd.h>
|
||||
|
||||
#include "../vpatterndb/calculator.h"
|
||||
#include "../vpatterndb/vtranslatevars.h"
|
||||
|
@ -55,8 +56,6 @@
|
|||
#include "../vwidgets/scalesceneitems.h"
|
||||
#include "../vwidgets/global.h"
|
||||
|
||||
template <class K, class V> class QHash;
|
||||
|
||||
QT_WARNING_PUSH
|
||||
QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
|
||||
QT_WARNING_DISABLE_INTEL(1418)
|
||||
|
|
|
@ -75,7 +75,8 @@ SOURCES += \
|
|||
tst_readval.cpp \
|
||||
tst_vtranslatevars.cpp \
|
||||
tst_vabstractpiece.cpp \
|
||||
tst_vtooluniondetails.cpp
|
||||
tst_vtooluniondetails.cpp \
|
||||
tst_xsdschema.cpp
|
||||
|
||||
*msvc*:SOURCES += stable.cpp
|
||||
|
||||
|
@ -104,7 +105,8 @@ HEADERS += \
|
|||
tst_readval.h \
|
||||
tst_vtranslatevars.h \
|
||||
tst_vabstractpiece.h \
|
||||
tst_vtooluniondetails.h
|
||||
tst_vtooluniondetails.h \
|
||||
tst_xsdschema.h
|
||||
|
||||
# Set using ccache. Function enable_ccache() defined in common.pri.
|
||||
$$enable_ccache()
|
||||
|
|
|
@ -35,6 +35,8 @@
|
|||
#include "../ifc/xml/vwatermarkconverter.h"
|
||||
#include "../ifc/xml/vparsererrorhandler.h"
|
||||
|
||||
#include <QTest>
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
#include <xercesc/parsers/XercesDOMParser.hpp>
|
||||
|
||||
|
|
Loading…
Reference in a new issue