diff --git a/qbs/imports/VApp.qbs b/qbs/imports/VApp.qbs index 936104886..89e6dde61 100644 --- a/qbs/imports/VApp.qbs +++ b/qbs/imports/VApp.qbs @@ -46,33 +46,33 @@ CppApplication { // Qt from scratch without OpenSSL support. condition: qbs.targetOS.contains("windows") && (qbs.architecture.contains("x86_64") || qbs.architecture.contains("x86")) name: "openssl" - prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "win", "openssl", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/dist/win/" files: { var files = []; // Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1. if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12 && Qt.core.versionPatch >= 4) { if (qbs.architecture.contains("x86_64")) { files.push( - FileInfo.joinPaths("win64", "libcrypto-1_1-x64.dll"), - FileInfo.joinPaths("win64", "libssl-1_1-x64.dll") + "openssl/win64/libcrypto-1_1-x64.dll", + "openssl/win64/libssl-1_1-x64.dll" ); } else { files.push( - FileInfo.joinPaths("win32", "libcrypto-1_1.dll"), - FileInfo.joinPaths("win32", "libssl-1_1.dll") + "openssl/win32/libcrypto-1_1.dll", + "openssl/win32/libssl-1_1.dll" ); } } else { files.push("msvcr120.dll"); if (qbs.architecture.contains("x86_64")) { files.push( - FileInfo.joinPaths("win64", "libeay32.dll"), - FileInfo.joinPaths("win64", "ssleay32.dll") + "openssl/win64/libeay32.dll", + "openssl/win64/ssleay32.dll" ); } else { files.push( - FileInfo.joinPaths("win32", "libeay32.dll"), - FileInfo.joinPaths("win32", "ssleay32.dll") + "openssl/win32/libeay32.dll", + "openssl/win32/ssleay32.dll" ); } } diff --git a/qbs/imports/VToolApp.qbs b/qbs/imports/VToolApp.qbs index 9631bd027..ac51dbbea 100644 --- a/qbs/imports/VToolApp.qbs +++ b/qbs/imports/VToolApp.qbs @@ -23,7 +23,7 @@ VApp { Group { name: "freedesktop" - prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/dist/" files: [ "ua.com.smart-pattern." + product.targetName + ".desktop" ] @@ -38,7 +38,7 @@ VApp { Group { name: "Translations" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "translations", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/translations/" files: { var files = []; diff --git a/qbs/modules/buildconfig/buildconfig.qbs b/qbs/modules/buildconfig/buildconfig.qbs index ab0cec87d..c2f8e6466 100644 --- a/qbs/modules/buildconfig/buildconfig.qbs +++ b/qbs/modules/buildconfig/buildconfig.qbs @@ -801,7 +801,7 @@ Module { Group { name: "Precompiled headers" condition: buildconfig.enablePCH - prefix: FileInfo.joinPaths(product.sourceDirectory, FileInfo.pathSeparator()) + prefix: product.sourceDirectory + "/" files: { var files = ["stable.h"]; if (qbs.toolchain.contains("msvc")) diff --git a/qbs/modules/tenv/tenv.qbs b/qbs/modules/tenv/tenv.qbs index c8e1b7c3b..163228c9b 100644 --- a/qbs/modules/tenv/tenv.qbs +++ b/qbs/modules/tenv/tenv.qbs @@ -28,7 +28,7 @@ Module { })); artifactNames = artifactNames.concat((inputs["multisize_tables"] || []).map(function(file){ - return FileInfo.joinPaths(product.buildDirectory, "tables", "multisize",file.fileName); + return FileInfo.joinPaths(product.buildDirectory, "tables/multisize",file.fileName); })); artifactNames = artifactNames.concat((inputs["label_templates"] || []).map(function(file){ @@ -92,7 +92,7 @@ Module { })); destination = destination.concat((inputs["multisize_tables"] || []).map(function(artifact) { - return FileInfo.joinPaths(product.buildDirectory, "tables", "multisize", artifact.fileName); + return FileInfo.joinPaths(product.buildDirectory, "tables/multisize", artifact.fileName); })); destination = destination.concat((inputs["label_templates"] || []).map(function(artifact) { diff --git a/share/translations/measurements.qbs b/share/translations/measurements.qbs index fed0c6df9..40a163ee9 100644 --- a/share/translations/measurements.qbs +++ b/share/translations/measurements.qbs @@ -9,7 +9,7 @@ Product { Group { name: "Headers" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/" files: [ "libs/vpatterndb/vtranslatemeasurements.h" ] @@ -18,7 +18,7 @@ Product { Group { name: "Sources" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/" files: [ "libs/vpatterndb/vtranslatemeasurements.cpp" ] diff --git a/share/translations/translations.qbs b/share/translations/translations.qbs index 68c8c825f..792a7fdc2 100644 --- a/share/translations/translations.qbs +++ b/share/translations/translations.qbs @@ -9,7 +9,7 @@ Product { Group { name: "Headers" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/" files: [ "app/**/*.h", "app/**/*.hpp", @@ -24,7 +24,7 @@ Product { Group { name: "Sources" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/" files: [ "app/**/*.cpp", "app/**/*.js", @@ -41,7 +41,7 @@ Product { Group { name: "Forms" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/" files: [ "app/**/*.ui", "libs/**/*.ui" diff --git a/src/app/puzzle/puzzle.qbs b/src/app/puzzle/puzzle.qbs index e4ec52913..0172f9535 100644 --- a/src/app/puzzle/puzzle.qbs +++ b/src/app/puzzle/puzzle.qbs @@ -160,8 +160,7 @@ VToolApp { cpp.defines: { var defines = []; var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; - defines.push('PUZZLE_BUILDDIR="' + exportingProduct.buildDirectory + FileInfo.pathSeparator() + - exportingProduct.targetName + extension +'"'); + defines.push('PUZZLE_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"'); return defines; } } @@ -169,7 +168,7 @@ VToolApp { Group { condition: qbs.targetOS.contains("windows") && (qbs.architecture.contains("x86_64") || qbs.architecture.contains("x86")) name: "pdftops Windows" - prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "win", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/dist/win/" files: ["pdftops.exe"] fileTags: ["pdftops_dist_win"] qbs.install: true @@ -179,7 +178,7 @@ VToolApp { Group { condition: qbs.targetOS.contains("macos") && qbs.architecture.contains("x86_64") name: "pdftops MacOS" - prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "macx", "bin64", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/dist/macx/bin64/" files: ["pdftops"] fileTags: ["pdftops_dist_macx"] qbs.install: true @@ -188,70 +187,70 @@ VToolApp { Group { name: "48x48/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/48x48/apps/" files: "puzzle.png" fileTags: "freedesktop.48x48AppsIcons" } Group { name: "64x64/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/64x64/apps/" files: "puzzle.png" fileTags: "freedesktop.64x64AppsIcons" } Group { name: "128x128/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/128x128/apps/" files: "puzzle.png" fileTags: "freedesktop.128x128AppsIcons" } Group { name: "256x256/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/256x256/apps/" files: "puzzle.png" fileTags: "freedesktop.256x256AppsIcons" } Group { name: "512x512/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/512x512/apps/" files: "puzzle.png" fileTags: "freedesktop.512x512AppsIcons" } Group { name: "apps48x48/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/48x48/mimetypes/" files: "application-x-valentina-layout.png" fileTags: "freedesktop.48x48MimetypesIcons" } Group { name: "apps64x64/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/64x64/mimetypes/" files: "application-x-valentina-layout.png" fileTags: "freedesktop.64x64MimetypesIcons" } Group { name: "apps128x128/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/128x128/mimetypes/" files: "application-x-valentina-layout.png" fileTags: "freedesktop.128x128MimetypesIcons" } Group { name: "apps256x256/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/256x256/mimetypes/" files: "application-x-valentina-layout.png" fileTags: "freedesktop.256x256MimetypesIcons" } Group { name: "apps512x512/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/512x512/mimetypes/" files: "application-x-valentina-layout.png" fileTags: "freedesktop.512x512MimetypesIcons" } @@ -260,12 +259,12 @@ VToolApp { condition: qbs.targetOS.contains("macos") fileTagsFilter: "qm" qbs.install: true - qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "translations" + qbs.installDir: buildconfig.installDataPath + "/translations" } Group { name: "Puzzle RC" - prefix: FileInfo.joinPaths(product.sourceDirectory, "share", "resources", FileInfo.pathSeparator()) + prefix: product.sourceDirectory + "/share/resources/" files: "puzzle.rc" } } diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs index 173a28f72..630833dee 100644 --- a/src/app/tape/tape.qbs +++ b/src/app/tape/tape.qbs @@ -83,101 +83,100 @@ VToolApp { cpp.defines: { var defines = []; var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; - defines.push('TAPE_BUILDDIR="' + exportingProduct.buildDirectory + FileInfo.pathSeparator() + - exportingProduct.targetName + extension +'"'); + defines.push('TAPE_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"'); return defines; } } Group { name: "Multisize tables" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", "tables", "multisize", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/app/share/tables/multisize/" files: [ "GOST_man_ru.vst" ] fileTags: ["multisize_tables"] qbs.install: true - qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "tables" + FileInfo.pathSeparator() + "multisize" + qbs.installDir: buildconfig.installDataPath + "/tables/multisize" } Group { name: "Measurements templates" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", "tables", "templates", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/app/share/tables/templates/" files: [ "template_all_measurements.vit", "t_Aldrich_Women.vit" ] fileTags: ["measurements_templates"] qbs.install: true - qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "tables" + FileInfo.pathSeparator() + "templates" + qbs.installDir: buildconfig.installDataPath + "/tables/templates" } Group { name: "48x48/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/48x48/apps/" files: "tape.png" fileTags: "freedesktop.48x48AppsIcons" } Group { name: "64x64/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/64x64/apps/" files: "tape.png" fileTags: "freedesktop.64x64AppsIcons" } Group { name: "128x128/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/128x128/apps/" files: "tape.png" fileTags: "freedesktop.128x128AppsIcons" } Group { name: "256x256/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/256x256/apps/" files: "tape.png" fileTags: "freedesktop.256x256AppsIcons" } Group { name: "512x512/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/512x512/apps/" files: "tape.png" fileTags: "freedesktop.512x512AppsIcons" } Group { name: "apps48x48/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/48x48/mimetypes/" files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] fileTags: "freedesktop.48x48MimetypesIcons" } Group { name: "apps64x64/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/64x64/mimetypes/" files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] fileTags: "freedesktop.64x64MimetypesIcons" } Group { name: "apps128x128/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/128x128/mimetypes/" files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] fileTags: "freedesktop.128x128MimetypesIcons" } Group { name: "apps256x256/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/256x256/mimetypes/" files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] fileTags: "freedesktop.256x256MimetypesIcons" } Group { name: "apps512x512/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/512x512/mimetypes/" files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] fileTags: "freedesktop.512x512MimetypesIcons" } @@ -186,12 +185,12 @@ VToolApp { condition: qbs.targetOS.contains("macos") fileTagsFilter: "qm" qbs.install: true - qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "translations" + qbs.installDir: buildconfig.installDataPath + "/translations" } Group { name: "Diagrams" - prefix: FileInfo.joinPaths(product.sourceDirectory, "share", "resources", FileInfo.pathSeparator()) + prefix: product.sourceDirectory + "/share/resources/" files: "diagrams.qrc" fileTags: "ebr.external_qrc" } @@ -201,15 +200,15 @@ VToolApp { qbs.install: true qbs.installDir: { if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")) - return FileInfo.joinPaths("share", "valentina", FileInfo.pathSeparator()); + return "share/valentina/"; else - return buildconfig.installDataPath + FileInfo.pathSeparator(); + return buildconfig.installDataPath + "/"; } } Group { name: "Tape RC" - prefix: FileInfo.joinPaths(product.sourceDirectory, "share", "resources", FileInfo.pathSeparator()) + prefix: product.sourceDirectory + "/share/resources/" files: "tape.rc" } } diff --git a/src/app/valentina/valentina.qbs b/src/app/valentina/valentina.qbs index 64a565f08..bf40a41ee 100644 --- a/src/app/valentina/valentina.qbs +++ b/src/app/valentina/valentina.qbs @@ -147,52 +147,51 @@ VToolApp { cpp.defines: { var defines = []; var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; - defines.push('VALENTINA_BUILDDIR="' + exportingProduct.buildDirectory + FileInfo.pathSeparator() + - exportingProduct.targetName + extension +'"'); - defines.push('TRANSLATIONS_DIR="' + exportingProduct.buildDirectory + FileInfo.pathSeparator() + 'translations"'); + defines.push('VALENTINA_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"'); + defines.push('TRANSLATIONS_DIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, 'translations') +'"'); return defines; } } Group { name: "Label templates" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", "labels", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/app/share/labels/" files: [ "def_pattern_label.xml", "def_piece_label.xml" ] fileTags: ["label_templates"] qbs.install: true - qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "labels" + qbs.installDir: buildconfig.installDataPath + "/labels" } Group { name: "Multisize tables" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", "tables", "multisize", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/app/share/tables/multisize/" files: [ "GOST_man_ru.vst" ] fileTags: ["multisize_tables"] qbs.install: true - qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "tables" + FileInfo.pathSeparator() + "multisize" + qbs.installDir: buildconfig.installDataPath + "/tables/multisize" } Group { name: "Measurements templates" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", "tables", "templates", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/app/share/tables/templates/" files: [ "template_all_measurements.vit", "t_Aldrich_Women.vit" ] fileTags: ["measurements_templates"] qbs.install: true - qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "tables" + FileInfo.pathSeparator() + "templates" + qbs.installDir: buildconfig.installDataPath + "/tables/templates" } Group { condition: qbs.targetOS.contains("windows") && (qbs.architecture.contains("x86_64") || qbs.architecture.contains("x86")) name: "pdftops Windows" - prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "win", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/dist/win/" files: ["pdftops.exe"] fileTags: ["pdftops_dist_win"] qbs.install: true @@ -202,7 +201,7 @@ VToolApp { Group { condition: qbs.targetOS.contains("macos") && qbs.architecture.contains("x86_64") name: "pdftops MacOS" - prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "macx", "bin64", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/dist/macx/bin64/" files: ["pdftops"] fileTags: ["pdftops_dist_macx"] qbs.install: true @@ -211,7 +210,7 @@ VToolApp { Group { name: "freedesktop" - prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/dist/" files: [ "ua.com.smart-pattern." + product.targetName + ".metainfo.xml" ] @@ -219,70 +218,70 @@ VToolApp { Group { name: "48x48/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/48x48/apps/" files: "valentina.png" fileTags: "freedesktop.48x48AppsIcons" } Group { name: "64x64/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/64x64/apps/" files: "valentina.png" fileTags: "freedesktop.64x64AppsIcons" } Group { name: "128x128/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/128x128/apps/" files: "valentina.png" fileTags: "freedesktop.128x128AppsIcons" } Group { name: "256x256/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/256x256/apps/" files: "valentina.png" fileTags: "freedesktop.256x256AppsIcons" } Group { name: "512x512/apps" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "apps", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/512x512/apps/" files: "valentina.png" fileTags: "freedesktop.512x512AppsIcons" } Group { name: "apps48x48/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/48x48/mimetypes/" files: "application-x-valentina-pattern.png" fileTags: "freedesktop.48x48MimetypesIcons" } Group { name: "apps64x64/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/64x64/mimetypes/" files: "application-x-valentina-pattern.png" fileTags: "freedesktop.64x64MimetypesIcons" } Group { name: "apps128x128/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/128x128/mimetypes/" files: "application-x-valentina-pattern.png" fileTags: "freedesktop.128x128MimetypesIcons" } Group { name: "apps256x256/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/256x256/mimetypes/" files: "application-x-valentina-pattern.png" fileTags: "freedesktop.256x256MimetypesIcons" } Group { name: "apps512x512/mimetypes" - prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "mimetypes", FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/share/icons/512x512/mimetypes/" files: "application-x-valentina-pattern.png" fileTags: "freedesktop.512x512MimetypesIcons" } @@ -290,12 +289,12 @@ VToolApp { Group { fileTagsFilter: "qm" qbs.install: true - qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "translations" + qbs.installDir: buildconfig.installDataPath + "/translations" } Group { name: "Valentina RC" - prefix: FileInfo.joinPaths(product.sourceDirectory, "share", "resources", FileInfo.pathSeparator()) + prefix: product.sourceDirectory + "/share/resources/" files: "valentina.rc" } } diff --git a/src/test/CollectionTest/CollectionTest.qbs b/src/test/CollectionTest/CollectionTest.qbs index 1efc57407..228abf5f9 100644 --- a/src/test/CollectionTest/CollectionTest.qbs +++ b/src/test/CollectionTest/CollectionTest.qbs @@ -21,7 +21,7 @@ VTestApp { Group { name: "Tape test files" - prefix: "tst_tape" + FileInfo.pathSeparator() + prefix: "tst_tape/" files: [ "keiko.vit", "empty.vit", @@ -43,7 +43,7 @@ VTestApp { Group { name: "Valentina test files" - prefix: "tst_valentina" + FileInfo.pathSeparator() + prefix: "tst_valentina/" files: [ "empty.val", "issue_372.val", @@ -62,46 +62,45 @@ VTestApp { Group { name: "Collection files" - prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", - FileInfo.pathSeparator()) + prefix: project.sourceDirectory + "/src/app/share/" files: [ - FileInfo.joinPaths("collection", "bra.val"), - FileInfo.joinPaths("collection", "bra.vit"), - FileInfo.joinPaths("collection", "jacketM1_52-176.val"), - FileInfo.joinPaths("collection", "jacketM2_40-146.val"), - FileInfo.joinPaths("collection", "jacketM3_40-146.val"), - FileInfo.joinPaths("collection", "jacketM4_40-146.val"), - FileInfo.joinPaths("collection", "jacketM5_30-110.val"), - FileInfo.joinPaths("collection", "jacketM6_30-110.val"), - FileInfo.joinPaths("collection", "pantsM1_52-176.val"), - FileInfo.joinPaths("collection", "pantsM2_40-146.val"), - FileInfo.joinPaths("collection", "pantsM7.val"), - FileInfo.joinPaths("collection", "TShirt_test.val"), - FileInfo.joinPaths("collection", "TestDart.val"), - FileInfo.joinPaths("collection", "pattern_blusa.val"), - FileInfo.joinPaths("collection", "blusa.vit"), - FileInfo.joinPaths("collection", "PajamaTopWrap2.val"), - FileInfo.joinPaths("collection", "Susan.vit"), - FileInfo.joinPaths("collection", "Moulage_0.5_armhole_neckline.val"), - FileInfo.joinPaths("collection", "0.7_Armhole_adjustment_0.10.val"), - FileInfo.joinPaths("collection", "my_calculated_measurements_for_val.vit"), - FileInfo.joinPaths("collection", "Keiko_skirt.val"), - FileInfo.joinPaths("collection", "keiko.vit"), - FileInfo.joinPaths("collection", "medidas_eli2015.vit"), - FileInfo.joinPaths("collection", "pantalon_base_Eli.val"), - FileInfo.joinPaths("collection", "Razmernye_priznaki_dlya_zhenskogo_zhaketa.vit"), - FileInfo.joinPaths("collection", "IMK_Zhaketa_poluprilegayuschego_silueta.val"), - FileInfo.joinPaths("collection", "Lara_Jil.vit"), - FileInfo.joinPaths("collection", "modell_2.val"), - FileInfo.joinPaths("collection", "MaleShirt", "MaleShirt.val"), - FileInfo.joinPaths("collection", "MaleShirt", "MaleShirt.vit"), - FileInfo.joinPaths("collection", "Trousers", "Trousers.val"), - FileInfo.joinPaths("collection", "Trousers", "trousers.vit"), - FileInfo.joinPaths("collection", "Steampunk_trousers.val"), - FileInfo.joinPaths("collection", "Steampunk_trousers.vit"), - FileInfo.joinPaths("collection", "Basic_block_women-2016.val"), - FileInfo.joinPaths("collection", "Gent_Jacket_with_tummy.val"), - FileInfo.joinPaths("tables", "multisize", "GOST_man_ru.vst") + "collection/bra.val", + "collection/bra.vit", + "collection/jacketM1_52-176.val", + "collection/jacketM2_40-146.val", + "collection/jacketM3_40-146.val", + "collection/jacketM4_40-146.val", + "collection/jacketM5_30-110.val", + "collection/jacketM6_30-110.val", + "collection/pantsM1_52-176.val", + "collection/pantsM2_40-146.val", + "collection/pantsM7.val", + "collection/TShirt_test.val", + "collection/TestDart.val", + "collection/pattern_blusa.val", + "collection/blusa.vit", + "collection/PajamaTopWrap2.val", + "collection/Susan.vit", + "collection/Moulage_0.5_armhole_neckline.val", + "collection/0.7_Armhole_adjustment_0.10.val", + "collection/my_calculated_measurements_for_val.vit", + "collection/Keiko_skirt.val", + "collection/keiko.vit", + "collection/medidas_eli2015.vit", + "collection/pantalon_base_Eli.val", + "collection/Razmernye_priznaki_dlya_zhenskogo_zhaketa.vit", + "collection/IMK_Zhaketa_poluprilegayuschego_silueta.val", + "collection/Lara_Jil.vit", + "collection/modell_2.val", + "collection/MaleShirt/MaleShirt.val", + "collection/MaleShirt/MaleShirt.vit", + "collection/Trousers/Trousers.val", + "collection/Trousers/trousers.vit", + "collection/Steampunk_trousers.val", + "collection/Steampunk_trousers.vit", + "collection/Basic_block_women-2016.val", + "collection/Gent_Jacket_with_tummy.val", + "tables/multisize/GOST_man_ru.vst" ] fileTags: ["tst_collection_files"] }