From 8c70272e60d047df45f2108f9a79640c0fca0512 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 11 Nov 2020 09:53:43 +0200 Subject: [PATCH 1/8] Bump version. --- ChangeLog.txt | 2 +- appveyor.yml | 2 +- dist/OBS_debian/debian.changelog | 4 ++-- dist/debian/changelog | 4 ++-- dist/macx/tape/Info.plist | 4 ++-- dist/macx/valentina/Info.plist | 4 ++-- dist/rpm/_service | 2 +- dist/rpm/valentina.spec | 2 +- dist/valentina.dsc | 8 ++++---- share/bintray.json | 6 +++--- src/libs/vmisc/projectversion.cpp | 2 +- src/libs/vmisc/projectversion.h | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index a505b4469..0731ee921 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,4 @@ -# Version 0.7.37 (unreleased) +# Version 0.7.37 Nov 11, 2020 - Fix Tape crash on Mac OS X. - Fix issue in VAbstractCurve::CurveIntersectAxis. - Improve editing a spline path through control points for locked angles. diff --git a/appveyor.yml b/appveyor.yml index 2488ff2b3..3048def19 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -258,7 +258,7 @@ deploy: package: valentina-win_auto-upload publish: true override: true - version: 0.7.36 + version: 0.7.37 on: DEPLOY: true artifact: valentina-win-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT) diff --git a/dist/OBS_debian/debian.changelog b/dist/OBS_debian/debian.changelog index 384fbf8ed..4d378f2bb 100644 --- a/dist/OBS_debian/debian.changelog +++ b/dist/OBS_debian/debian.changelog @@ -1,5 +1,5 @@ -valentina (0.7.36) trusty; urgency=low +valentina (0.7.37) trusty; urgency=low * Auto build. - -- dismine Sat, 24 Oct 2020 12:27:00 +0300 + -- dismine Wed, 11 Nov 2020 12:27:00 +0300 diff --git a/dist/debian/changelog b/dist/debian/changelog index 384fbf8ed..4d378f2bb 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,5 +1,5 @@ -valentina (0.7.36) trusty; urgency=low +valentina (0.7.37) trusty; urgency=low * Auto build. - -- dismine Sat, 24 Oct 2020 12:27:00 +0300 + -- dismine Wed, 11 Nov 2020 12:27:00 +0300 diff --git a/dist/macx/tape/Info.plist b/dist/macx/tape/Info.plist index 2fd5c2196..6108f164f 100755 --- a/dist/macx/tape/Info.plist +++ b/dist/macx/tape/Info.plist @@ -19,9 +19,9 @@ CFBundleIdentifier io.bitbucket.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.7.36 + 0.7.37 CFBundleVersion - 0.7.36.0 + 0.7.37.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/macx/valentina/Info.plist b/dist/macx/valentina/Info.plist index ddedf49e9..682584efe 100755 --- a/dist/macx/valentina/Info.plist +++ b/dist/macx/valentina/Info.plist @@ -19,9 +19,9 @@ CFBundleIdentifier io.bitbucket.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.7.36 + 0.7.37 CFBundleVersion - 0.7.36.0 + 0.7.37.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/rpm/_service b/dist/rpm/_service index f7342140b..73a551dff 100644 --- a/dist/rpm/_service +++ b/dist/rpm/_service @@ -1,7 +1,7 @@ git://github.com/dismine/Valentina_git.git - 0.7.36 + 0.7.37 valentina git .git diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index b7508a2ef..2f49bc274 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -91,7 +91,7 @@ Requires: poppler-tools Requires: poppler-utils %endif -Version: 0.7.36 +Version: 0.7.37 Release: 0 URL: https://gitlab.com/smart-pattern/valentina License: GPL-3.0+ diff --git a/dist/valentina.dsc b/dist/valentina.dsc index 8a617e86a..c513a831a 100644 --- a/dist/valentina.dsc +++ b/dist/valentina.dsc @@ -2,7 +2,7 @@ Format: 3.0 (native) Source: valentina Binary: valentina Architecture: i386 amd64 -Version: 0.7.36 +Version: 0.7.37 Maintainer: Roman Telezhynskyi Homepage: https://valentinaproject.bitbucket.io Standards-Version: 3.9.5 @@ -18,8 +18,8 @@ Build-Depends: debhelper (>= 8.0.0), Package-List: valentina deb graphics optional Checksums-Sha1: - 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.36.tar + 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.37.tar Checksums-Sha256: - 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.36.tar + 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.37.tar Files: - 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.36.tar + 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.37.tar diff --git a/share/bintray.json b/share/bintray.json index bb6a06cac..75f44f881 100644 --- a/share/bintray.json +++ b/share/bintray.json @@ -15,10 +15,10 @@ }, "version": { - "name": "0.7.36", + "name": "0.7.37", "desc": "Test branch release", - "released": "2020-10-24", - "vcs_tag": "v0.7.36", + "released": "2020-11-11", + "vcs_tag": "v0.7.37", "gpgSign": false }, diff --git a/src/libs/vmisc/projectversion.cpp b/src/libs/vmisc/projectversion.cpp index 21433cd37..44ed74ec1 100644 --- a/src/libs/vmisc/projectversion.cpp +++ b/src/libs/vmisc/projectversion.cpp @@ -42,7 +42,7 @@ extern const int MAJOR_VERSION = 0; extern const int MINOR_VERSION = 7; -extern const int DEBUG_VERSION = 36; +extern const int DEBUG_VERSION = 37; extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION) .arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE)); diff --git a/src/libs/vmisc/projectversion.h b/src/libs/vmisc/projectversion.h index 2831c0397..fbcf6feed 100644 --- a/src/libs/vmisc/projectversion.h +++ b/src/libs/vmisc/projectversion.h @@ -49,8 +49,8 @@ extern const QString APP_VERSION_STR; // Change version number in projectversion.cpp too. // Synchronize valentina.nsi -#define VER_FILEVERSION 0,7,36 -#define VER_FILEVERSION_STR "0.7.36\0" +#define VER_FILEVERSION 0,7,37 +#define VER_FILEVERSION_STR "0.7.37\0" #define V_PRERELEASE // Mark prerelease builds From 17bf8574d1e36df7a3600b412d52f91d50b74e2f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 11 Nov 2020 13:59:21 +0200 Subject: [PATCH 2/8] Lupdate. --- share/translations/valentina_cs_CZ.ts | 24 ++++++++++---------- share/translations/valentina_de_DE.ts | 24 ++++++++++---------- share/translations/valentina_el_GR.ts | 24 ++++++++++---------- share/translations/valentina_en_CA.ts | 24 ++++++++++---------- share/translations/valentina_en_IN.ts | 24 ++++++++++---------- share/translations/valentina_en_US.ts | 24 ++++++++++---------- share/translations/valentina_es_ES.ts | 32 +++++++++++++-------------- share/translations/valentina_fi_FI.ts | 8 +++---- share/translations/valentina_fr_FR.ts | 24 ++++++++++---------- share/translations/valentina_it_IT.ts | 24 ++++++++++---------- share/translations/valentina_nl_NL.ts | 32 +++++++++++++-------------- share/translations/valentina_pl_PL.ts | 24 ++++++++++---------- share/translations/valentina_pt_BR.ts | 24 ++++++++++---------- share/translations/valentina_ro_RO.ts | 8 +++---- share/translations/valentina_ru_RU.ts | 32 +++++++++++++-------------- share/translations/valentina_uk_UA.ts | 24 ++++++++++---------- 16 files changed, 188 insertions(+), 188 deletions(-) diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index 6363ee693..95a61aabf 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -2691,11 +2691,11 @@ Pen style: - Styl pera: + Styl pera: Color: - Barva: + Barva: Ready @@ -2715,7 +2715,7 @@ Default - Výchozí + Výchozí Invalid point @@ -2810,11 +2810,11 @@ Pen style: - Styl pera: + Styl pera: Color: - Barva: + Barva: Ready @@ -2834,7 +2834,7 @@ Default - Výchozí + Výchozí Invalid line points @@ -4366,11 +4366,11 @@ Přesto použít nastavení? Pen style: - Styl pera: + Styl pera: Color: - Barva: + Barva: Ready @@ -4390,7 +4390,7 @@ Přesto použít nastavení? Default - Výchozí + Výchozí Invalid angle formula @@ -6223,11 +6223,11 @@ Přesto použít nastavení? Pen style: - Styl pera: + Styl pera: Color: - Barva: + Barva: Ready @@ -6267,7 +6267,7 @@ Přesto použít nastavení? Default - Výchozí + Výchozí diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index 0e18c6fb4..994b8e853 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -2691,11 +2691,11 @@ Pen style: - Zeichenstil: + Zeichenstil: Color: - Farbe: + Farbe: Ready @@ -2715,7 +2715,7 @@ Default - Standard + Standard Invalid point @@ -2810,11 +2810,11 @@ Pen style: - Zeichenstil: + Zeichenstil: Color: - Farbe: + Farbe: Ready @@ -2834,7 +2834,7 @@ Default - Standard + Standard Invalid line points @@ -4365,11 +4365,11 @@ Einstellungen trotzdem anwenden? Pen style: - Zeichenstil: + Zeichenstil: Color: - Farbe: + Farbe: Ready @@ -4389,7 +4389,7 @@ Einstellungen trotzdem anwenden? Default - Standard + Standard Invalid angle formula @@ -6221,11 +6221,11 @@ Einstellungen trotzdem anwenden? Pen style: - Zeichenstil: + Zeichenstil: Color: - Farbe: + Farbe: Ready @@ -6265,7 +6265,7 @@ Einstellungen trotzdem anwenden? Default - Standard + Standard diff --git a/share/translations/valentina_el_GR.ts b/share/translations/valentina_el_GR.ts index 6d9cba2e6..1cbdcded6 100644 --- a/share/translations/valentina_el_GR.ts +++ b/share/translations/valentina_el_GR.ts @@ -2647,11 +2647,11 @@ Pen style: - Στυλ μαρκαδόρου: + Στυλ μαρκαδόρου: Color: - Χρώμα: + Χρώμα: Ready @@ -2671,7 +2671,7 @@ Default - Προεπιλογή + Προεπιλογή Invalid point @@ -2766,11 +2766,11 @@ Pen style: - Στυλ μαρκαδόρου: + Στυλ μαρκαδόρου: Color: - Χρώμα: + Χρώμα: Ready @@ -2790,7 +2790,7 @@ Default - Προεπιλογή + Προεπιλογή Invalid line points @@ -4293,11 +4293,11 @@ Apply settings anyway? Pen style: - Στυλ μαρκαδόρου: + Στυλ μαρκαδόρου: Color: - Χρώμα: + Χρώμα: Ready @@ -4317,7 +4317,7 @@ Apply settings anyway? Default - Προεπιλογή + Προεπιλογή Invalid angle formula @@ -6137,11 +6137,11 @@ Apply settings anyway? Pen style: - Στυλ μαρκαδόρου: + Στυλ μαρκαδόρου: Color: - Χρώμα: + Χρώμα: Ready @@ -6181,7 +6181,7 @@ Apply settings anyway? Default - Προεπιλογή + Προεπιλογή diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index b5d94b957..9681c8e9f 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -2691,11 +2691,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2715,7 +2715,7 @@ Default - Default + Default Invalid point @@ -2810,11 +2810,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2834,7 +2834,7 @@ Default - Default + Default Invalid line points @@ -4364,11 +4364,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -4388,7 +4388,7 @@ Apply settings anyway? Default - Default + Default Invalid angle formula @@ -6220,11 +6220,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -6264,7 +6264,7 @@ Apply settings anyway? Default - Default + Default diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index 439778832..c2480636f 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -2691,11 +2691,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2715,7 +2715,7 @@ Default - Default + Default Invalid point @@ -2810,11 +2810,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2834,7 +2834,7 @@ Default - Default + Default Invalid line points @@ -4364,11 +4364,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -4388,7 +4388,7 @@ Apply settings anyway? Default - Default + Default Invalid angle formula @@ -6220,11 +6220,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -6264,7 +6264,7 @@ Apply settings anyway? Default - Default + Default diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 9421df604..2735dfa37 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -2691,11 +2691,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2715,7 +2715,7 @@ Default - Default + Default Invalid point @@ -2810,11 +2810,11 @@ Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -2834,7 +2834,7 @@ Default - Default + Default Invalid line points @@ -4364,11 +4364,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -4388,7 +4388,7 @@ Apply settings anyway? Default - Default + Default Invalid angle formula @@ -6220,11 +6220,11 @@ Apply settings anyway? Pen style: - Pen style: + Pen style: Color: - Color: + Color: Ready @@ -6264,7 +6264,7 @@ Apply settings anyway? Default - Default + Default diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index dff37d971..76c114342 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -2691,15 +2691,15 @@ Pen style: - Estilo lápiz: + Estilo lápiz: Color: - Color: + Color: Ready - Listo + Listo Invalid suffix @@ -2715,7 +2715,7 @@ Default - + Predeterminado Invalid point @@ -2810,15 +2810,15 @@ Pen style: - Estilo lápiz: + Estilo lápiz: Color: - Color: + Color: Ready - Listo + Listo Invalid suffix @@ -2834,7 +2834,7 @@ Default - + Predeterminado Invalid line points @@ -4365,15 +4365,15 @@ Aplicar características de todos modos? Pen style: - Estilo lápiz: + Estilo lápiz: Color: - Color: + Color: Ready - Listo + Listo Invalid suffix @@ -4389,7 +4389,7 @@ Aplicar características de todos modos? Default - + Predeterminado Invalid angle formula @@ -6221,15 +6221,15 @@ Aplicar características de todos modos? Pen style: - Estilo lápiz: + Estilo lápiz: Color: - Color: + Color: Ready - Listo + Listo Invalid suffix @@ -6265,7 +6265,7 @@ Aplicar características de todos modos? Default - + Predeterminado diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index 93a5feef7..4fb8dd3a3 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -2327,7 +2327,7 @@ Default - Oletus + Oletus Invalid point @@ -2442,7 +2442,7 @@ Default - Oletus + Oletus Invalid line points @@ -3885,7 +3885,7 @@ Apply settings anyway? Default - Oletus + Oletus Invalid angle formula @@ -5613,7 +5613,7 @@ Apply settings anyway? Default - Oletus + Oletus diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 362349e41..6b5692722 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -2691,11 +2691,11 @@ Pen style: - Style de stylo: + Style de stylo: Color: - + Couleur : Ready @@ -2715,7 +2715,7 @@ Default - + Défaut Invalid point @@ -2810,11 +2810,11 @@ Pen style: - Style de stylo: + Style de stylo: Color: - + Couleur : Ready @@ -2834,7 +2834,7 @@ Default - + Défaut Invalid line points @@ -4361,11 +4361,11 @@ Apply settings anyway? Pen style: - Style de stylo: + Style de stylo: Color: - + Couleur : Ready @@ -4385,7 +4385,7 @@ Apply settings anyway? Default - + Défaut Invalid angle formula @@ -6217,11 +6217,11 @@ Apply settings anyway? Pen style: - Style de stylo: + Style de stylo: Color: - + Couleur : Ready @@ -6261,7 +6261,7 @@ Apply settings anyway? Default - + Défaut diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index 4542667f0..ec852ced6 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -2683,11 +2683,11 @@ Pen style: - Stile di penna: + Stile penna: Color: - Colore: + Colore: Ready @@ -2707,7 +2707,7 @@ Default - Default + Default Invalid point @@ -2802,11 +2802,11 @@ Pen style: - Stile di penna: + Stile penna: Color: - Colore: + Colore: Ready @@ -2826,7 +2826,7 @@ Default - Default + Default Invalid line points @@ -4358,11 +4358,11 @@ Applicare la configurazione comunque? Pen style: - Stile di penna: + Stile penna: Color: - Colore: + Colore: Ready @@ -4382,7 +4382,7 @@ Applicare la configurazione comunque? Default - Default + Default Invalid angle formula @@ -6214,11 +6214,11 @@ Applicare la configurazione comunque? Pen style: - Stile di penna: + Stile penna: Color: - Colore: + Colore: Ready @@ -6258,7 +6258,7 @@ Applicare la configurazione comunque? Default - Default + Default diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 20fe9b97f..77669fafd 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -2691,15 +2691,15 @@ Pen style: - Pen stijl: + Pen stijl: Color: - Kleur: + Kleur: Ready - Klaar + Klaar Invalid suffix @@ -2715,7 +2715,7 @@ Default - + Standaard Invalid point @@ -2810,15 +2810,15 @@ Pen style: - Pen stijl: + Pen stijl: Color: - Kleur: + Kleur: Ready - Klaar + Klaar Invalid suffix @@ -2834,7 +2834,7 @@ Default - + Standaard Invalid line points @@ -4366,15 +4366,15 @@ Toch de instellingen aanpassen? Pen style: - Pen stijl: + Pen stijl: Color: - Kleur: + Kleur: Ready - Klaar + Klaar Invalid suffix @@ -4390,7 +4390,7 @@ Toch de instellingen aanpassen? Default - + Standaard Invalid angle formula @@ -6222,15 +6222,15 @@ Toch de instellingen aanpassen? Pen style: - Pen stijl: + Pen stijl: Color: - Kleur: + Kleur: Ready - Klaar + Klaar Invalid suffix @@ -6266,7 +6266,7 @@ Toch de instellingen aanpassen? Default - + Standaard diff --git a/share/translations/valentina_pl_PL.ts b/share/translations/valentina_pl_PL.ts index 3fd77e068..034efbb6e 100644 --- a/share/translations/valentina_pl_PL.ts +++ b/share/translations/valentina_pl_PL.ts @@ -2507,11 +2507,11 @@ Pen style: - Styl pióra: + Styl pióra: Color: - Kolor: + Kolor: Ready @@ -2531,7 +2531,7 @@ Default - Domyślny + Domyślny Invalid point @@ -2626,11 +2626,11 @@ Pen style: - Styl pióra: + Styl pióra: Color: - Kolor: + Kolor: Ready @@ -2650,7 +2650,7 @@ Default - Domyślny + Domyślny Invalid line points @@ -4045,11 +4045,11 @@ Apply settings anyway? Pen style: - Styl pióra: + Styl pióra: Color: - Kolor: + Kolor: Ready @@ -4069,7 +4069,7 @@ Apply settings anyway? Default - Domyślny + Domyślny Invalid angle formula @@ -5702,11 +5702,11 @@ Apply settings anyway? Pen style: - Styl pióra: + Styl pióra: Color: - Kolor: + Kolor: Ready @@ -5746,7 +5746,7 @@ Apply settings anyway? Default - Domyślny + Domyślny diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index b3cf50faa..d23f5fd19 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -2691,11 +2691,11 @@ Pen style: - Estilo Caneta: + Estilo Caneta: Color: - Cor: + Cor: Ready @@ -2715,7 +2715,7 @@ Default - Padrão + Padrão Invalid point @@ -2810,11 +2810,11 @@ Pen style: - Estilo Caneta: + Estilo Caneta: Color: - Cor: + Cor: Ready @@ -2834,7 +2834,7 @@ Default - Padrão + Padrão Invalid line points @@ -4362,11 +4362,11 @@ Aplicar configurações de qualquer forma? Pen style: - Estilo Caneta: + Estilo Caneta: Color: - Cor: + Cor: Ready @@ -4386,7 +4386,7 @@ Aplicar configurações de qualquer forma? Default - Padrão + Padrão Invalid angle formula @@ -6218,11 +6218,11 @@ Aplicar configurações de qualquer forma? Pen style: - Estilo Caneta: + Estilo Caneta: Color: - Cor: + Cor: Ready @@ -6262,7 +6262,7 @@ Aplicar configurações de qualquer forma? Default - Padrão + Padrão diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 405d404b2..bd4741422 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -2476,7 +2476,7 @@ Color: - Culoare: + Culoare: Ready @@ -2591,7 +2591,7 @@ Color: - Culoare: + Culoare: Ready @@ -4038,7 +4038,7 @@ Apply settings anyway? Color: - Culoare: + Culoare: Ready @@ -5651,7 +5651,7 @@ Apply settings anyway? Color: - Culoare: + Culoare: Ready diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 6013cba31..d11082f06 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -2691,15 +2691,15 @@ Pen style: - Стиль пера: + Стиль пера: Color: - Цвет: + Цвет: Ready - Готово + Готово Invalid suffix @@ -2715,7 +2715,7 @@ Default - По умолчанию + По умолчанию Invalid point @@ -2810,15 +2810,15 @@ Pen style: - Стиль пера: + Стиль пера: Color: - Цвет: + Цвет: Ready - Готово + Готово Invalid suffix @@ -2834,7 +2834,7 @@ Default - По умолчанию + По умолчанию Invalid line points @@ -4366,15 +4366,15 @@ Apply settings anyway? Pen style: - Стиль пера: + Стиль пера: Color: - Цвет: + Цвет: Ready - Готово + Готово Invalid suffix @@ -4390,7 +4390,7 @@ Apply settings anyway? Default - По умолчанию + По умолчанию Invalid angle formula @@ -6223,15 +6223,15 @@ Apply settings anyway? Pen style: - Стиль пера: + Стиль пера: Color: - Цвет: + Цвет: Ready - Готово + Готово Invalid suffix @@ -6267,7 +6267,7 @@ Apply settings anyway? Default - По умолчанию + По умолчанию diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index e4325b8b6..5250534d4 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -2691,11 +2691,11 @@ Pen style: - Тип пера: + Тип пера: Color: - Колір: + Колір: Ready @@ -2715,7 +2715,7 @@ Default - По замовчуванню + По замовчуванню Invalid point @@ -2810,11 +2810,11 @@ Pen style: - Тип пера: + Тип пера: Color: - Колір: + Колір: Ready @@ -2834,7 +2834,7 @@ Default - По замовчуванню + По замовчуванню Invalid line points @@ -4364,11 +4364,11 @@ Apply settings anyway? Pen style: - Тип пера: + Тип пера: Color: - Колір: + Колір: Ready @@ -4388,7 +4388,7 @@ Apply settings anyway? Default - По замовчуванню + По замовчуванню Invalid angle formula @@ -6221,11 +6221,11 @@ Apply settings anyway? Pen style: - Тип пера: + Тип пера: Color: - Колір: + Колір: Ready @@ -6265,7 +6265,7 @@ Apply settings anyway? Default - По замовчуванню + По замовчуванню From 48bc720daaec6fca06f1f8a754e6212cc4fa8dc1 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 12 Nov 2020 14:00:14 +0200 Subject: [PATCH 3/8] Add missing signals. --- src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp | 3 +++ src/libs/vtools/dialogs/tools/dialogrotation.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp index a9ae13539..582794b4e 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp @@ -88,6 +88,9 @@ DialogFlippingByLine::DialogFlippingByLine(const VContainer *data, quint32 toolI this, &DialogFlippingByLine::PointChanged); connect(ui->comboBoxSecondLinePoint, &QComboBox::currentTextChanged, this, &DialogFlippingByLine::PointChanged); + + connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogFlippingByLine::ShowSourceDetails); + connect(ui->lineEditAlias, &QLineEdit::textEdited, this, &DialogFlippingByLine::AliasChanged); connect(ui->comboBoxPenStyle, QOverload::of(&QComboBox::currentIndexChanged), this, &DialogFlippingByLine::PenStyleChanged); connect(ui->comboBoxColor, QOverload::of(&QComboBox::currentIndexChanged), this, diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index a996f4341..283765a87 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -107,6 +107,9 @@ DialogRotation::DialogRotation(const VContainer *data, quint32 toolId, QWidget * connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogRotation::DeployAngleTextEdit); connect(ui->comboBoxOriginPoint, &QComboBox::currentTextChanged, this, &DialogRotation::PointChanged); + + connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogRotation::ShowSourceDetails); + connect(ui->lineEditAlias, &QLineEdit::textEdited, this, &DialogRotation::AliasChanged); connect(ui->comboBoxPenStyle, QOverload::of(&QComboBox::currentIndexChanged), this, &DialogRotation::PenStyleChanged); connect(ui->comboBoxColor, QOverload::of(&QComboBox::currentIndexChanged), this, From ce8f369d60df471d0415a7dd2d74a79d8960b5fe Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 12 Nov 2020 15:40:44 +0200 Subject: [PATCH 4/8] Lupdate. --- share/translations/valentina_ru_RU.ts | 172 +++++++++++++------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index d11082f06..d09397c29 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -580,7 +580,7 @@ Notes - + Заметки @@ -711,11 +711,11 @@ Notes - + Заметки Alias: - + Псевдоним: @@ -838,11 +838,11 @@ Notes - + Заметки Alias: - + Псевдоним: @@ -969,7 +969,7 @@ Notes - + Заметки @@ -1040,11 +1040,11 @@ Notes - + Заметки Alias: - + Псевдоним: @@ -1099,11 +1099,11 @@ Notes - + Заметки Alias: - + Псевдоним: @@ -1210,7 +1210,7 @@ Notes - + Заметки @@ -1293,15 +1293,15 @@ Notes - + Заметки Alias1: - + Псевдоним 1: Alias2: - + Псевдоним 2: @@ -1384,15 +1384,15 @@ Notes - + Заметки Alias1: - + Псевдоним 1: Alias2: - + Псевдоним 2: @@ -1475,15 +1475,15 @@ Notes - + Заметки Alias1: - + Псевдоним 1: Alias2: - + Псевдоним 2: @@ -2338,11 +2338,11 @@ Notes - + Заметки Alias: - + Псевдоним: @@ -2453,7 +2453,7 @@ Notes - + Заметки @@ -2683,11 +2683,11 @@ Notes - + Заметки Alias: - + Псевдоним: Pen style: @@ -2703,15 +2703,15 @@ Invalid suffix - + Неправильный суффикс Invalid group name - + Неверное имя группы Label: - + Метка: Default @@ -2719,15 +2719,15 @@ Invalid point - + Неправильная точка Invalid label - + Неправильная метка Invalid alias - + Неправильный псевдоним @@ -2802,11 +2802,11 @@ Notes - + Заметки Alias: - + Псевдоним: Pen style: @@ -2822,15 +2822,15 @@ Invalid suffix - + Неправильный суффикс Invalid group name - + Неверное имя группы Label: - + Метка: Default @@ -2838,7 +2838,7 @@ Invalid line points - + Неправильные точки линии Invalid first line point @@ -2850,11 +2850,11 @@ Invalid label - + Неправильная метка Invalid alias - + Неправильный псевдоним @@ -2976,7 +2976,7 @@ Notes - + Заметки @@ -3840,7 +3840,7 @@ Apply settings anyway? Notes - + Заметки @@ -3907,7 +3907,7 @@ Apply settings anyway? Notes - + Заметки @@ -4034,7 +4034,7 @@ Apply settings anyway? Notes - + Заметки @@ -4358,11 +4358,11 @@ Apply settings anyway? Notes - + Заметки Alias: - + Псевдоним: Pen style: @@ -4378,15 +4378,15 @@ Apply settings anyway? Invalid suffix - + Неправильный суффикс Invalid group name - + Неверное имя группы Label: - + Метка: Default @@ -4394,23 +4394,23 @@ Apply settings anyway? Invalid angle formula - + Неверная формула угла Invalid rotation angle formula - + Неверная формула угла поворота Invalid length formula - + Неверная формула длины Invalid label - + Неправильная метка Invalid alias - + Неправильный псевдоним @@ -4619,7 +4619,7 @@ Apply settings anyway? Notes - + Заметки @@ -5596,7 +5596,7 @@ Apply settings anyway? Notes - + Заметки @@ -5695,7 +5695,7 @@ Apply settings anyway? Notes - + Заметки @@ -5790,7 +5790,7 @@ Apply settings anyway? Notes - + Заметки @@ -5849,7 +5849,7 @@ Apply settings anyway? Notes - + Заметки @@ -5916,7 +5916,7 @@ Apply settings anyway? Notes - + Заметки @@ -6031,7 +6031,7 @@ Apply settings anyway? Notes - + Заметки @@ -6078,7 +6078,7 @@ Apply settings anyway? Notes - + Заметки @@ -6215,11 +6215,11 @@ Apply settings anyway? Notes - + Заметки Alias - + Псевдоним Pen style: @@ -6235,35 +6235,35 @@ Apply settings anyway? Invalid suffix - + Неправильный суффикс Invalid group name - + Неверное имя группы Invalid rotation point - + Неправильная точка вращения Invalid label - + Неправильная метка Invalid alias - + Неправильный псевдоним Invalid angle formula - + Неверная формула угла Label: - + Метка: Alias: - + Псевдоним: Default @@ -6898,7 +6898,7 @@ Apply settings anyway? Notes - + Заметки @@ -6941,7 +6941,7 @@ Apply settings anyway? Notes - + Заметки @@ -7088,11 +7088,11 @@ Apply settings anyway? Notes - + Заметки Alias: - + Псевдоним: @@ -7247,11 +7247,11 @@ Apply settings anyway? Notes - + Заметки Alias: - + Псевдоним: @@ -7440,7 +7440,7 @@ Apply settings anyway? Notes - + Заметки @@ -7551,7 +7551,7 @@ Apply settings anyway? Notes - + Заметки @@ -10452,7 +10452,7 @@ This option will take an affect after restart. Piece name '%1' is not unique. - + Имя детали "%1" не уникальное. Error in path '%1'. Calculating segment for curve '%2' has failed. %3 @@ -12643,7 +12643,7 @@ Do you want to save your changes? default - + по умолчанию @@ -14145,7 +14145,7 @@ Do you want to save your changes? Main path of piece %1 - + Главный контур детали %1 @@ -14164,7 +14164,7 @@ Do you want to save your changes? Not supported file suffix '%1' - + Не поддерживаемый суффикс файла '%1' cm @@ -15111,15 +15111,15 @@ Do you want to save your changes? Alias: - + Псевдоним: Alias1: - + Псевдоним 1: Alias2: - + Псевдоним 2: From 34fd0b81bf867650d4f8d51454342885200c2575 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 12 Nov 2020 16:01:10 +0200 Subject: [PATCH 5/8] Allow controlling collection timeout over environment variable VTEST_RUN_TIMEOUT. #79 --- src/libs/vtest/abstracttest.cpp | 20 ++++++++++++++++++++ src/libs/vtest/abstracttest.h | 2 ++ 2 files changed, 22 insertions(+) diff --git a/src/libs/vtest/abstracttest.cpp b/src/libs/vtest/abstracttest.cpp index 2ed18bf9f..fa92c9a83 100644 --- a/src/libs/vtest/abstracttest.cpp +++ b/src/libs/vtest/abstracttest.cpp @@ -352,9 +352,29 @@ QString AbstractTest::TranslationsPath() const return QCoreApplication::applicationDirPath() + QStringLiteral("/../../../app/valentina/bin/translations"); } +//--------------------------------------------------------------------------------------------------------------------- +int AbstractTest::RunTimeout(int defMsecs) +{ +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + QString timeout = QString::fromLocal8Bit(qgetenv("VTEST_RUN_TIMEOUT")); + if (timeout.isEmpty()) + { + return defMsecs; + } +#else + QString timeout = qEnvironmentVariable("VTEST_RUN_TIMEOUT", QString::number(msecs)); +#endif + + bool ok = false; + int msecs = timeout.toInt(&ok); + return ok ? msecs : defMsecs; +} + //--------------------------------------------------------------------------------------------------------------------- int AbstractTest::Run(int exit, const QString &program, const QStringList &arguments, QString &error, int msecs) { + msecs = AbstractTest::RunTimeout(msecs); + const QString parameters = QStringLiteral("Program: %1 \nArguments: %2.") .arg(program, arguments.join(QStringLiteral(", "))); diff --git a/src/libs/vtest/abstracttest.h b/src/libs/vtest/abstracttest.h index 1e858039d..cd7b4c2d9 100644 --- a/src/libs/vtest/abstracttest.h +++ b/src/libs/vtest/abstracttest.h @@ -85,6 +85,8 @@ protected: QString TapePath() const; QString TranslationsPath() const; + static int RunTimeout(int defMsecs); + int Run(int exit, const QString &program, const QStringList &arguments, QString &error, int msecs = 120000); bool CopyRecursively(const QString &srcFilePath, const QString &tgtFilePath) const; From 9e4fa8337da95a0a570aece622c35fae0160f358 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 12 Nov 2020 16:19:08 +0200 Subject: [PATCH 6/8] Fix validation issue. Treat empty attribute as default value. --- src/libs/ifc/schema/pattern/v0.8.10.xsd | 2 ++ src/libs/vtools/tools/toolsdef.h | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libs/ifc/schema/pattern/v0.8.10.xsd b/src/libs/ifc/schema/pattern/v0.8.10.xsd index 55d5765f8..66ca72f87 100644 --- a/src/libs/ifc/schema/pattern/v0.8.10.xsd +++ b/src/libs/ifc/schema/pattern/v0.8.10.xsd @@ -825,6 +825,7 @@ + @@ -857,6 +858,7 @@ + diff --git a/src/libs/vtools/tools/toolsdef.h b/src/libs/vtools/tools/toolsdef.h index f9743797f..cf144504b 100644 --- a/src/libs/vtools/tools/toolsdef.h +++ b/src/libs/vtools/tools/toolsdef.h @@ -31,15 +31,17 @@ #include #include +#include "../ifc/ifcdef.h" + class VGObject; class VContainer; struct SourceItem { - quint32 id{0}; + quint32 id{NULL_ID}; QString alias{}; - QString penStyle{}; - QString color{}; + QString penStyle{TypeLineDefault}; + QString color{ColorDefault}; }; Q_DECLARE_METATYPE(SourceItem) From e730cba188b252f23c339d4b4fc035ce060bd52a Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 12 Nov 2020 16:34:56 +0200 Subject: [PATCH 7/8] Bump version. --- ChangeLog.txt | 3 +++ appveyor.yml | 2 +- dist/OBS_debian/debian.changelog | 4 ++-- dist/debian/changelog | 4 ++-- dist/macx/tape/Info.plist | 4 ++-- dist/macx/valentina/Info.plist | 4 ++-- dist/rpm/_service | 2 +- dist/rpm/valentina.spec | 2 +- dist/valentina.dsc | 8 ++++---- share/bintray.json | 6 +++--- src/libs/vmisc/projectversion.cpp | 2 +- src/libs/vmisc/projectversion.h | 4 ++-- 12 files changed, 24 insertions(+), 21 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 0731ee921..928d35d93 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,6 @@ +# Version 0.7.38 Nov 12, 2020 +- Bug fixes. + # Version 0.7.37 Nov 11, 2020 - Fix Tape crash on Mac OS X. - Fix issue in VAbstractCurve::CurveIntersectAxis. diff --git a/appveyor.yml b/appveyor.yml index 3048def19..967bc88e6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -258,7 +258,7 @@ deploy: package: valentina-win_auto-upload publish: true override: true - version: 0.7.37 + version: 0.7.38 on: DEPLOY: true artifact: valentina-win-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT) diff --git a/dist/OBS_debian/debian.changelog b/dist/OBS_debian/debian.changelog index 4d378f2bb..f1462eed1 100644 --- a/dist/OBS_debian/debian.changelog +++ b/dist/OBS_debian/debian.changelog @@ -1,5 +1,5 @@ -valentina (0.7.37) trusty; urgency=low +valentina (0.7.38) trusty; urgency=low * Auto build. - -- dismine Wed, 11 Nov 2020 12:27:00 +0300 + -- dismine Thu, 12 Nov 2020 16:30:00 +0300 diff --git a/dist/debian/changelog b/dist/debian/changelog index 4d378f2bb..f1462eed1 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,5 +1,5 @@ -valentina (0.7.37) trusty; urgency=low +valentina (0.7.38) trusty; urgency=low * Auto build. - -- dismine Wed, 11 Nov 2020 12:27:00 +0300 + -- dismine Thu, 12 Nov 2020 16:30:00 +0300 diff --git a/dist/macx/tape/Info.plist b/dist/macx/tape/Info.plist index 6108f164f..4b6bbcff9 100755 --- a/dist/macx/tape/Info.plist +++ b/dist/macx/tape/Info.plist @@ -19,9 +19,9 @@ CFBundleIdentifier io.bitbucket.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.7.37 + 0.7.38 CFBundleVersion - 0.7.37.0 + 0.7.38.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/macx/valentina/Info.plist b/dist/macx/valentina/Info.plist index 682584efe..2b28a3b12 100755 --- a/dist/macx/valentina/Info.plist +++ b/dist/macx/valentina/Info.plist @@ -19,9 +19,9 @@ CFBundleIdentifier io.bitbucket.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.7.37 + 0.7.38 CFBundleVersion - 0.7.37.0 + 0.7.38.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/rpm/_service b/dist/rpm/_service index 73a551dff..a7a5e5d46 100644 --- a/dist/rpm/_service +++ b/dist/rpm/_service @@ -1,7 +1,7 @@ git://github.com/dismine/Valentina_git.git - 0.7.37 + 0.7.38 valentina git .git diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 2f49bc274..cd6e3f0b0 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -91,7 +91,7 @@ Requires: poppler-tools Requires: poppler-utils %endif -Version: 0.7.37 +Version: 0.7.38 Release: 0 URL: https://gitlab.com/smart-pattern/valentina License: GPL-3.0+ diff --git a/dist/valentina.dsc b/dist/valentina.dsc index c513a831a..f62afb612 100644 --- a/dist/valentina.dsc +++ b/dist/valentina.dsc @@ -2,7 +2,7 @@ Format: 3.0 (native) Source: valentina Binary: valentina Architecture: i386 amd64 -Version: 0.7.37 +Version: 0.7.38 Maintainer: Roman Telezhynskyi Homepage: https://valentinaproject.bitbucket.io Standards-Version: 3.9.5 @@ -18,8 +18,8 @@ Build-Depends: debhelper (>= 8.0.0), Package-List: valentina deb graphics optional Checksums-Sha1: - 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.37.tar + 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.38.tar Checksums-Sha256: - 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.37.tar + 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.38.tar Files: - 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.37.tar + 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.38.tar diff --git a/share/bintray.json b/share/bintray.json index 75f44f881..58ac90717 100644 --- a/share/bintray.json +++ b/share/bintray.json @@ -15,10 +15,10 @@ }, "version": { - "name": "0.7.37", + "name": "0.7.38", "desc": "Test branch release", - "released": "2020-11-11", - "vcs_tag": "v0.7.37", + "released": "2020-11-12", + "vcs_tag": "v0.7.38", "gpgSign": false }, diff --git a/src/libs/vmisc/projectversion.cpp b/src/libs/vmisc/projectversion.cpp index 44ed74ec1..86dbfe5c7 100644 --- a/src/libs/vmisc/projectversion.cpp +++ b/src/libs/vmisc/projectversion.cpp @@ -42,7 +42,7 @@ extern const int MAJOR_VERSION = 0; extern const int MINOR_VERSION = 7; -extern const int DEBUG_VERSION = 37; +extern const int DEBUG_VERSION = 38; extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION) .arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE)); diff --git a/src/libs/vmisc/projectversion.h b/src/libs/vmisc/projectversion.h index fbcf6feed..66334edde 100644 --- a/src/libs/vmisc/projectversion.h +++ b/src/libs/vmisc/projectversion.h @@ -49,8 +49,8 @@ extern const QString APP_VERSION_STR; // Change version number in projectversion.cpp too. // Synchronize valentina.nsi -#define VER_FILEVERSION 0,7,37 -#define VER_FILEVERSION_STR "0.7.37\0" +#define VER_FILEVERSION 0,7,38 +#define VER_FILEVERSION_STR "0.7.38\0" #define V_PRERELEASE // Mark prerelease builds From 3c7f565d861f14ebd95cdc891a80d1d694aa3f81 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 12 Nov 2020 17:30:30 +0200 Subject: [PATCH 8/8] Fix build. --- src/libs/vtest/abstracttest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/vtest/abstracttest.cpp b/src/libs/vtest/abstracttest.cpp index fa92c9a83..a10ebdcd1 100644 --- a/src/libs/vtest/abstracttest.cpp +++ b/src/libs/vtest/abstracttest.cpp @@ -362,7 +362,7 @@ int AbstractTest::RunTimeout(int defMsecs) return defMsecs; } #else - QString timeout = qEnvironmentVariable("VTEST_RUN_TIMEOUT", QString::number(msecs)); + QString timeout = qEnvironmentVariable("VTEST_RUN_TIMEOUT", QString::number(defMsecs)); #endif bool ok = false;