Merge develop

Bump up to version 0.9.8b

Add textutils unit tests

Fix generic IC broken by b723eaab. Fixes issue #3859

change date to 2021-08-03

FritzingInfo.plist

@@ -27,9 +27,9 @@ You should have received a copy of the GNU General Public License
         <key>CFBundleExecutable</key>
         <string>Fritzing</string>
         <key>CFBundleGetInfoString</key>
-        <string>Fritzing 0.9.7</string>
+        <string>Fritzing 0.9.8</string>
         <key>CFBundleShortVersionString</key>
-        <string>0.9.7</string>
+        <string>0.9.8</string>
         <key>CFBundleVersion</key>
         <string>bda4e</string>
         <key>CFBundleIconFile</key>

fritzing.rc

@@ -2,11 +2,11 @@ IDI_ICON1               ICON    DISCARDABLE     "resources/system_icons/win/frit
 
 #include <windows.h>
 
-#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"

org.fritzing.Fritzing.appdata.xml

@@ -49,7 +49,7 @@
  <!-- <url type="donation">https://fritzing.org/shop/donations/</url> -->
  <url type="translate">https://fritzing.org/support-us/language-translation/</url>
  <releases>
-  <release version="0.9.7" date="2021-05-21"/>
+  <release version="0.9.8" date="2021-08-03"/>
  </releases>
  <provides>
   <binary>Fritzing</binary>

src/items/dip.cpp

@@ -124,7 +124,7 @@ QString Dip::genModuleID(QMap<QString, QString> & 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);
 	}
 }
 

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;

src/version/version.cpp

@@ -33,7 +33,7 @@ along with Fritzing.  If not, see <http://www.gnu.org/licenses/>.
 
 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

tests/auto/auto.pro

@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 
-SUBDIRS = test_svg
+SUBDIRS = test_svg test_textutils