aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include vsapoint.cpp only before C++17.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-01-16 18:48:21 +02:00
parent 16c5117b9c
commit 74bd52652e
2 changed files with 52 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/vlayout/vlayout.qbs
View File

@ -11,7 +11,8 @@ VLib {
Depends { name: "VFormatLib" } Depends { name: "VFormatLib" }
name: "VLayoutLib" name: "VLayoutLib"
files: [ files: {
var files = [
"vlayoutexporter.h", "vlayoutexporter.h",
"vlayoutgenerator.h", "vlayoutgenerator.h",
"vlayoutdef.h", "vlayoutdef.h",
@ -46,7 +47,6 @@ VLib {
"vlayoutpoint.cpp", "vlayoutpoint.cpp",
"vposition.cpp", "vposition.cpp",
"vrawlayout.cpp", "vrawlayout.cpp",
"vsapoint.cpp",
"vprintlayout.cpp", "vprintlayout.cpp",
"vtextmanager.cpp", "vtextmanager.cpp",
"vposter.cpp", "vposter.cpp",
@ -54,8 +54,15 @@ VLib {
"vabstractpiece.cpp", "vabstractpiece.cpp",
"vlayoutpiece.cpp", "vlayoutpiece.cpp",
"vlayoutpiecepath.cpp", "vlayoutpiecepath.cpp",
"vrawsapoint.cpp", "vrawsapoint.cpp"
] ];
if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor < 12) {
files.push("vsapoint.cpp"); // need only before C++17
}
return files;
}
Group { Group {
name: "dialogs" name: "dialogs"

1
src/libs/vlayout/vsapoint.cpp
View File

@ -26,7 +26,6 @@
** **
*************************************************************************/ *************************************************************************/
// See https://stackoverflow.com/a/46719572/3045403 // See https://stackoverflow.com/a/46719572/3045403
#if __cplusplus < 201703L #if __cplusplus < 201703L
#include "vsapoint.h" #include "vsapoint.h"