mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
No commits in common. "a85595ef3d6d329aace5399e7419f95d37c35f7d" and "505cd6d62fb66eb84a97e0a065a7b6a45d8909c4" have entirely different histories.
a85595ef3d
...
505cd6d62f
|
@ -804,10 +804,8 @@ Module {
|
||||||
}
|
}
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
|
condition: Utilities.versionCompare(qbs.version, "1.22") < 0
|
||||||
cpp.systemIncludePaths: {
|
cpp.systemIncludePaths: {
|
||||||
var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")];
|
|
||||||
|
|
||||||
if (Utilities.versionCompare(qbs.version, "1.22") < 0) {
|
|
||||||
var qtLibs = [
|
var qtLibs = [
|
||||||
"QtCore",
|
"QtCore",
|
||||||
"QtSvg",
|
"QtSvg",
|
||||||
|
@ -821,6 +819,8 @@ Module {
|
||||||
"QtConcurrent"
|
"QtConcurrent"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
var paths = [];
|
||||||
|
|
||||||
if (!qbs.targetOS.contains("macos"))
|
if (!qbs.targetOS.contains("macos"))
|
||||||
{
|
{
|
||||||
paths.push(Qt.core.incPath);
|
paths.push(Qt.core.incPath);
|
||||||
|
@ -831,13 +831,11 @@ Module {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
for (var i = 0; i < qtLibs.length; i++) {
|
for (var i = 0; i < qtLibs.length; i++) {
|
||||||
paths.push(FileInfo.joinPaths(Qt.core.incPath,
|
paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i] + ".framework/Versions/" + Qt.core.versionMajor +
|
||||||
qtLibs[i] + ".framework/Versions/" + Qt.core.versionMajor +
|
|
||||||
"/Headers"));
|
"/Headers"));
|
||||||
paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i] + ".framework/Headers"));
|
paths.push(FileInfo.joinPaths(Qt.core.incPath, qtLibs[i] + ".framework/Headers"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return paths;
|
return paths;
|
||||||
}
|
}
|
||||||
|
|
|
@ -836,7 +836,7 @@
|
||||||
</xs:simpleType>
|
</xs:simpleType>
|
||||||
<xs:simpleType name="contentType">
|
<xs:simpleType name="contentType">
|
||||||
<xs:restriction base="xs:string">
|
<xs:restriction base="xs:string">
|
||||||
<xs:pattern value="image/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
|
<xs:pattern value="image\\/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
|
||||||
</xs:restriction>
|
</xs:restriction>
|
||||||
</xs:simpleType>
|
</xs:simpleType>
|
||||||
<xs:simpleType name="colors">
|
<xs:simpleType name="colors">
|
||||||
|
|
|
@ -845,7 +845,7 @@
|
||||||
</xs:simpleType>
|
</xs:simpleType>
|
||||||
<xs:simpleType name="contentType">
|
<xs:simpleType name="contentType">
|
||||||
<xs:restriction base="xs:string">
|
<xs:restriction base="xs:string">
|
||||||
<xs:pattern value="image/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
|
<xs:pattern value="image\\/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
|
||||||
</xs:restriction>
|
</xs:restriction>
|
||||||
</xs:simpleType>
|
</xs:simpleType>
|
||||||
<xs:simpleType name="colors">
|
<xs:simpleType name="colors">
|
||||||
|
|
|
@ -855,7 +855,7 @@
|
||||||
</xs:simpleType>
|
</xs:simpleType>
|
||||||
<xs:simpleType name="contentType">
|
<xs:simpleType name="contentType">
|
||||||
<xs:restriction base="xs:string">
|
<xs:restriction base="xs:string">
|
||||||
<xs:pattern value="image/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
|
<xs:pattern value="image\\/[-\w]+(\.[-\w]+)*([+][-\w]+)?"/>
|
||||||
</xs:restriction>
|
</xs:restriction>
|
||||||
</xs:simpleType>
|
</xs:simpleType>
|
||||||
<xs:simpleType name="colors">
|
<xs:simpleType name="colors">
|
||||||
|
|
|
@ -142,7 +142,6 @@ auto VTextCodec::availableCodecs() -> QList<QByteArray>
|
||||||
while (i != codecs.constEnd())
|
while (i != codecs.constEnd())
|
||||||
{
|
{
|
||||||
names.append(ConstFirst(i.value()).toLatin1());
|
names.append(ConstFirst(i.value()).toLatin1());
|
||||||
++i;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return names;
|
return names;
|
||||||
|
|
|
@ -75,7 +75,6 @@ void TST_DXF::initTestCase()
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void TST_DXF::TestCodecPage_data()
|
void TST_DXF::TestCodecPage_data()
|
||||||
{
|
{
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
QTest::addColumn<QString>("locale");
|
QTest::addColumn<QString>("locale");
|
||||||
|
|
||||||
QStringList locales = SupportedLocales();
|
QStringList locales = SupportedLocales();
|
||||||
|
@ -84,13 +83,11 @@ void TST_DXF::TestCodecPage_data()
|
||||||
{
|
{
|
||||||
QTest::newRow(locale.toLatin1()) << locale;
|
QTest::newRow(locale.toLatin1()) << locale;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void TST_DXF::TestCodecPage()
|
void TST_DXF::TestCodecPage()
|
||||||
{
|
{
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
QFETCH(QString, locale);
|
QFETCH(QString, locale);
|
||||||
|
|
||||||
static QMap <QString, QString> locMap = LocaleMap();
|
static QMap <QString, QString> locMap = LocaleMap();
|
||||||
|
@ -125,7 +122,4 @@ void TST_DXF::TestCodecPage()
|
||||||
|
|
||||||
QVERIFY2(codec != nullptr, qUtf8Printable(QStringLiteral("No codec for dxf codepage %1 found.")
|
QVERIFY2(codec != nullptr, qUtf8Printable(QStringLiteral("No codec for dxf codepage %1 found.")
|
||||||
.arg(dxfCodePage)));
|
.arg(dxfCodePage)));
|
||||||
#else
|
|
||||||
QSKIP("No full support for old codecs since Qt6.");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,12 +30,13 @@
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
|
#include "../vmisc/defglobal.h"
|
||||||
|
|
||||||
class TST_DXF :public QObject
|
class TST_DXF :public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT // NOLINT
|
Q_OBJECT // NOLINT
|
||||||
public:
|
public:
|
||||||
explicit TST_DXF(QObject *parent = nullptr);
|
explicit TST_DXF(QObject *parent = nullptr);
|
||||||
~TST_DXF() = default;
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void initTestCase();
|
void initTestCase();
|
||||||
|
|
Loading…
Reference in a new issue