diff --git a/FritzingInfo.plist b/FritzingInfo.plist index 0f93ad89a..b461f010f 100644 --- a/FritzingInfo.plist +++ b/FritzingInfo.plist @@ -27,9 +27,9 @@ You should have received a copy of the GNU General Public License CFBundleExecutable Fritzing CFBundleGetInfoString - Fritzing 0.9.7 + Fritzing 0.9.8 CFBundleShortVersionString - 0.9.7 + 0.9.8 CFBundleVersion bda4e CFBundleIconFile diff --git a/fritzing.rc b/fritzing.rc index 09bb4b5f2..0cded572b 100644 --- a/fritzing.rc +++ b/fritzing.rc @@ -2,11 +2,11 @@ IDI_ICON1 ICON DISCARDABLE "resources/system_icons/win/frit #include -#define VER_FILEVERSION 0,9,7,0 -#define VER_FILEVERSION_STR "0.9.7\0" +#define VER_FILEVERSION 0,9,8,0 +#define VER_FILEVERSION_STR "0.9.8\0" -#define VER_PRODUCTVERSION 0,9,7,0 -#define VER_PRODUCTVERSION_STR "0.9.7\0" +#define VER_PRODUCTVERSION 0,9,8,0 +#define VER_PRODUCTVERSION_STR "0.9.8\0" #define VER_COMPANYNAME_STR "Fritzing" #define VER_FILEDESCRIPTION_STR "Fritzing" diff --git a/org.fritzing.Fritzing.appdata.xml b/org.fritzing.Fritzing.appdata.xml index 88042276c..dad4c14b7 100644 --- a/org.fritzing.Fritzing.appdata.xml +++ b/org.fritzing.Fritzing.appdata.xml @@ -49,7 +49,7 @@ https://fritzing.org/support-us/language-translation/ - + Fritzing diff --git a/src/items/dip.cpp b/src/items/dip.cpp index 1bbebdef8..cb95bdde3 100644 --- a/src/items/dip.cpp +++ b/src/items/dip.cpp @@ -124,7 +124,7 @@ QString Dip::genModuleID(QMap & currPropsMap) int p = pins.toInt(); if (p < 4) p = 4; if (p % 2 == 1) p--; - return QString("generic_ic_dip_%1_%2").arg(QString(p), spacing); + return QString("generic_ic_dip_%1_%2").arg(QString::number(p), spacing); } } diff --git a/src/version/partschecker.cpp b/src/version/partschecker.cpp index 09d604b74..581bd4913 100644 --- a/src/version/partschecker.cpp +++ b/src/version/partschecker.cpp @@ -250,7 +250,7 @@ bool PartsChecker::checkIfClean(const QString & repoPath, errorNumber++; branchName = git_reference_shorthand(head); // TODO: Remove this restriction, maybe limited to an 'expert mode' - if (branchName != "master" && branchName != "release_0.9.7") { + if (branchName != "master" && branchName != "release_0.9.8") { partsCheckerResult.partsCheckerError = PARTS_CHECKER_ERROR_USED_GIT; partsCheckerResult.errorMessage = sNotInMasterBranch.arg(repoPath).arg(errorNumber).arg(sBoilerPlate2); goto cleanup; diff --git a/src/version/version.cpp b/src/version/version.cpp index 4263fa49a..a5644f35c 100644 --- a/src/version/version.cpp +++ b/src/version/version.cpp @@ -33,7 +33,7 @@ along with Fritzing. If not, see . QString Version::m_majorVersion("0"); QString Version::m_minorVersion("9"); -QString Version::m_minorSubVersion("7"); +QString Version::m_minorSubVersion("8"); QString Version::m_modifier("b"); QString Version::m_gitVersion(GIT_VERSION); QString Version::m_gitDate(GIT_DATE); // want standard ISO form diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 5db9e8bff..eaa085903 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -SUBDIRS = test_svg +SUBDIRS = test_svg test_textutils