Fixed build error, moved icons somewhere useful

palaeoware · Feb 11, 2020 · 253df92 · 253df92
1 parent ec69c23
commit 253df92
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/SPIERSalign/SPIERSalign.pro b/SPIERSalign/SPIERSalign.pro
@@ -40,6 +40,9 @@ OBJECTS_DIR = build
 FORMS += ui/mainwindow.ui \
     ui/about.ui
 
+#Mac icon
+ICON = resources/SPIERSalign.icns
+
 HEADERS += src/mainwindowimpl.h \
     src/globals.h \
     src/scene.h \

diff --git a/SPIERSalign/align.qrc b/SPIERSalign/align.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>resources/SPIERSalignIcon.svg</file>
+        <file>resources/SPIERSalignIcon.icns</file>
     </qresource>
 </RCC>
diff --git a/resources/SPIERSalignIcon.icns → SPIERSalign/resources/SPIERSalignIcon.icns b/resources/SPIERSalignIcon.icns → SPIERSalign/resources/SPIERSalignIcon.icns
diff --git a/resources/SPIERSeditIcon.icns → SPIERSedit/resources/SPIERSeditIcon.icns b/resources/SPIERSeditIcon.icns → SPIERSedit/resources/SPIERSeditIcon.icns
diff --git a/resources/SPIERSviewIcon.icns → SPIERSview/resources/SPIERSviewIcon.icns b/resources/SPIERSviewIcon.icns → SPIERSview/resources/SPIERSviewIcon.icns
diff --git a/SPIERSview/src/main.cpp b/SPIERSview/src/main.cpp
@@ -47,7 +47,6 @@ void logMessageOutput(QtMsgType type, const QMessageLogContext &context, const Q
         txt = QString("Info: %1 (%2:%3, %4)").arg(localMsg.constData()).arg(context.file).arg(context.line).arg(context.function);
         break;
     }
-}
 
 #ifndef __APPLE__
 
@@ -57,19 +56,20 @@ void logMessageOutput(QtMsgType type, const QMessageLogContext &context, const Q
 
 #ifdef QT_DEBUG
 // Save to debug.log
-QFile outFile("debug.log");
-outFile.open(QIODevice::WriteOnly | QIODevice::Append);
-QTextStream log(&outFile);
-log << txt << endl;
+    QFile outFile("debug.log");
+    outFile.open(QIODevice::WriteOnly | QIODevice::Append);
+    QTextStream log(&outFile);
+    log << txt << endl;
 
 // Now print to stout too
-QTextStream console(stdout);
-console << txt << endl;
+    QTextStream console(stdout);
+    console << txt << endl;
 #else
 // Print to stout only
-QTextStream console(stdout);
-console << txt << endl;
+    QTextStream console(stdout);
+    console << txt << endl;
 #endif
+}
 
 /**
  * @brief qMain::qMain