mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
No commits in common. "31f63f8a32d4a57b79a2f32699ab19ba1ddd7bd8" and "a85595ef3d6d329aace5399e7419f95d37c35f7d" have entirely different histories.
31f63f8a32
...
a85595ef3d
|
@ -73,7 +73,7 @@ linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
|
||||||
- qbs-config defaultProfile qt5
|
- qbs-config defaultProfile qt5
|
||||||
- qbs config profiles.qt5.baseProfile ${COMPILER}
|
- qbs config profiles.qt5.baseProfile ${COMPILER}
|
||||||
- qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt5 config:release
|
- qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt5 config:release
|
||||||
- xvfb-run -a qbs -p autotest-runner -d build profile:qt5 config:release
|
- xvfb-run -a qbs -p autotest-runner
|
||||||
|
|
||||||
#macos_task_template: &MACOS_TASK_TEMPLATE
|
#macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
# << : *REGULER_TASK_TEMPLATE
|
# << : *REGULER_TASK_TEMPLATE
|
||||||
|
|
|
@ -86,17 +86,4 @@ CppApplication {
|
||||||
qbs.install: true
|
qbs.install: true
|
||||||
qbs.installDir: buildconfig.installBinaryPath
|
qbs.installDir: buildconfig.installBinaryPath
|
||||||
}
|
}
|
||||||
|
|
||||||
Group {
|
|
||||||
name: "Precompiled headers"
|
|
||||||
condition: buildconfig.enablePCH
|
|
||||||
prefix: product.sourceDirectory + "/"
|
|
||||||
files: {
|
|
||||||
var files = ["stable.h"];
|
|
||||||
if (qbs.toolchain.contains("msvc"))
|
|
||||||
files.push("stable.cpp")
|
|
||||||
return files;
|
|
||||||
}
|
|
||||||
fileTags: ["cpp_pch_src"]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,17 +31,4 @@ Library {
|
||||||
cpp.minimumMacosVersion: buildconfig.minimumMacosVersion
|
cpp.minimumMacosVersion: buildconfig.minimumMacosVersion
|
||||||
bundle.isBundle: buildconfig.frameworksBuild
|
bundle.isBundle: buildconfig.frameworksBuild
|
||||||
}
|
}
|
||||||
|
|
||||||
Group {
|
|
||||||
name: "Precompiled headers"
|
|
||||||
condition: buildconfig.enablePCH
|
|
||||||
prefix: product.sourceDirectory + "/"
|
|
||||||
files: {
|
|
||||||
var files = ["stable.h"];
|
|
||||||
if (qbs.toolchain.contains("msvc"))
|
|
||||||
files.push("stable.cpp")
|
|
||||||
return files;
|
|
||||||
}
|
|
||||||
fileTags: ["cpp_pch_src"]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -501,7 +501,6 @@ Module {
|
||||||
"-Wstrict-overflow=3",
|
"-Wstrict-overflow=3",
|
||||||
"-Wstrict-overflow=4",
|
"-Wstrict-overflow=4",
|
||||||
"-Wstrict-overflow=5",
|
"-Wstrict-overflow=5",
|
||||||
"-Wno-error=strict-overflow",
|
|
||||||
"-Wstrict-prototypes",
|
"-Wstrict-prototypes",
|
||||||
"-Wstrict-selector-match",
|
"-Wstrict-selector-match",
|
||||||
"-Wstring-compare",
|
"-Wstring-compare",
|
||||||
|
@ -706,14 +705,8 @@ Module {
|
||||||
|
|
||||||
if (Utilities.versionCompare(cpp.compilerVersion, "11") >= 0) {
|
if (Utilities.versionCompare(cpp.compilerVersion, "11") >= 0) {
|
||||||
debugFlags.push(
|
debugFlags.push(
|
||||||
"-Wctad-maybe-unsupported"
|
"-Wctad-maybe-unsupported",
|
||||||
)
|
"-Wmismatched-tags" // bugged in gcc 10
|
||||||
}
|
|
||||||
|
|
||||||
if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos") &&
|
|
||||||
Utilities.versionCompare(cpp.compilerVersion, "10") >= 0) {
|
|
||||||
debugFlags.push(
|
|
||||||
"-Wno-mismatched-tags" // bugged in gcc
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -865,4 +858,17 @@ Module {
|
||||||
}
|
}
|
||||||
|
|
||||||
vcs2.headerFileName: "vcsRepoState.h"
|
vcs2.headerFileName: "vcsRepoState.h"
|
||||||
|
|
||||||
|
Group {
|
||||||
|
name: "Precompiled headers"
|
||||||
|
condition: buildconfig.enablePCH
|
||||||
|
prefix: product.sourceDirectory + "/"
|
||||||
|
files: {
|
||||||
|
var files = ["stable.h"];
|
||||||
|
if (qbs.toolchain.contains("msvc"))
|
||||||
|
files.push("stable.cpp")
|
||||||
|
return files;
|
||||||
|
}
|
||||||
|
fileTags: ["cpp_pch_src"]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,13 +6,11 @@ VTestApp {
|
||||||
Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
|
Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
|
||||||
Depends { name: "VTestLib" }
|
Depends { name: "VTestLib" }
|
||||||
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
|
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
|
||||||
Depends { name: "autotest" }
|
|
||||||
|
|
||||||
name: "CollectionTest"
|
name: "CollectionTest"
|
||||||
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
|
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
|
||||||
targetName: buildconfig.appTarget
|
targetName: buildconfig.appTarget
|
||||||
type: base.concat("tst_files")
|
type: base.concat("tst_files")
|
||||||
autotest.workingDir: product.buildDirectory
|
|
||||||
|
|
||||||
files: [
|
files: [
|
||||||
"qttestmainlambda.cpp",
|
"qttestmainlambda.cpp",
|
||||||
|
|
|
@ -5,12 +5,10 @@ VTestApp {
|
||||||
Depends { name: "VTestLib" }
|
Depends { name: "VTestLib" }
|
||||||
Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
|
Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
|
||||||
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
|
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
|
||||||
Depends { name: "autotest" }
|
|
||||||
|
|
||||||
name: "TranslationsTest"
|
name: "TranslationsTest"
|
||||||
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
|
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
|
||||||
targetName: buildconfig.appTarget
|
targetName: buildconfig.appTarget
|
||||||
autotest.workingDir: product.buildDirectory
|
|
||||||
|
|
||||||
files: [
|
files: [
|
||||||
"qttestmainlambda.cpp",
|
"qttestmainlambda.cpp",
|
||||||
|
|
|
@ -10,7 +10,6 @@ VTestApp {
|
||||||
Depends { name: "VDXFLib" }
|
Depends { name: "VDXFLib" }
|
||||||
Depends { name: "VFormatLib" }
|
Depends { name: "VFormatLib" }
|
||||||
Depends { name: "ebr" }
|
Depends { name: "ebr" }
|
||||||
Depends { name: "autotest" }
|
|
||||||
|
|
||||||
Depends {
|
Depends {
|
||||||
name: "Qt.xmlpatterns"
|
name: "Qt.xmlpatterns"
|
||||||
|
@ -21,8 +20,6 @@ VTestApp {
|
||||||
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "ValentinaTest" : "valentinaTest"
|
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "ValentinaTest" : "valentinaTest"
|
||||||
targetName: buildconfig.appTarget
|
targetName: buildconfig.appTarget
|
||||||
|
|
||||||
autotest.workingDir: product.buildDirectory
|
|
||||||
|
|
||||||
files: [
|
files: [
|
||||||
"qttestmainlambda.cpp",
|
"qttestmainlambda.cpp",
|
||||||
"tst_dxf.cpp",
|
"tst_dxf.cpp",
|
||||||
|
|
|
@ -30,16 +30,12 @@
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
|
|
||||||
#include "../vmisc/defglobal.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
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() override = default;
|
~TST_DXF() = default;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void initTestCase();
|
void initTestCase();
|
||||||
|
|
|
@ -25,16 +25,5 @@ Project {
|
||||||
]
|
]
|
||||||
qbsSearchPaths: "qbs"
|
qbsSearchPaths: "qbs"
|
||||||
|
|
||||||
AutotestRunner {
|
AutotestRunner {}
|
||||||
Depends { name: "buildconfig" }
|
|
||||||
|
|
||||||
environment: {
|
|
||||||
var env = base;
|
|
||||||
|
|
||||||
if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")) {
|
|
||||||
env.push("LD_LIBRARY_PATH=" + qbs.installRoot + qbs.installPrefix + "/" + buildconfig.libDirName + "/valentina");
|
|
||||||
}
|
|
||||||
return env;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue