Merge branch 'master' of github.com:Youda008/DoomRunner

Author: Youda008

README.md

@@ -239,16 +239,32 @@ make
 This guide assumes you have Homebrew installed
 
 ##### 1. Install Qt
+
+###### Intel
+
 ```
 brew install qt
 ```
 
-##### 2. Build the project
+###### M1 (Arm)
+
+Building for Qt 6 does not currently work on M1 (Arm) so you need to use Qt 5
+
+```
+brew install qt@5
+export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
+export LDFLAGS="-L/opt/homebrew/opt/qt@5/lib"
+export CPPFLAGS="-I/opt/homebrew/opt/qt@5/include"
+```
+
+##### 3. Build the project
+
 ```
 cd <DoomRunner directory>
 mkdir build-dynamic
 cd build-dynamic
 qmake ../DoomRunner.pro -spec macx-g++ "CONFIG+=release"
+make clean
 make
 ```
 

Sources/MainWindow.cpp

@@ -1530,11 +1530,11 @@ void MainWindow::showMapPackDesc( const QModelIndex & index )
 	}
 
 	// get the corresponding file with txt suffix
-	QFileInfo mapDescFileInfo = fs::replaceFileSuffix( mapDataFileInfo.filePath(), "txt" );
+	QFileInfo mapDescFileInfo(fs::replaceFileSuffix( mapDataFileInfo.filePath(), "txt" ));
 	if (!mapDescFileInfo.isFile())
 	{
 		// try TXT in case we are in a case-sensitive file-system such as Linux
-		mapDescFileInfo = fs::replaceFileSuffix( mapDataFileInfo.filePath(), "TXT" );
+		mapDescFileInfo = QFileInfo(fs::replaceFileSuffix( mapDataFileInfo.filePath(), "TXT" ));
 		if (!mapDescFileInfo.isFile())
 		{
 			reportUserError( this, "Cannot open map description",