Qt5 fixes

[minitube] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 95e9f128e4ee03dde7f3b782c0ec2ed89cf5b10f..a1232c921b94411cc27e511179b78254853d1f9e 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,6 +19,9 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include <qtsingleapplication.h>
 #include "constants.h"
 #include "mainwindow.h"
@@ -27,14 +30,16 @@ $END_LICENSE */
 #ifdef APP_EXTRA
 #include "extra.h"
 #endif
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 #include "mac_startup.h"
 #endif
 
 int main(int argc, char **argv) {
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     mac::MacMain();
+    // https://bugreports.qt-project.org/browse/QTBUG-32789
+    QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");
 #endif
 
     QtSingleApplication app(argc, argv);
@@ -75,7 +80,11 @@ int main(int argc, char **argv) {
 #else
     QString dataDir = "";
 #endif
+#ifdef APP_MAC
+    QString localeDir = qApp->applicationDirPath() + "/../Resources/locale";
+#else
     QString localeDir = qApp->applicationDirPath() + "/locale";
+#endif
     if (!QDir(localeDir).exists()) {
         localeDir = dataDir + "/locale";
     }
@@ -83,7 +92,9 @@ int main(int argc, char **argv) {
     QTranslator translator;
     translator.load(QLocale::system(), QString(), QString(), localeDir);
     app.installTranslator(&translator);
+#if QT_VERSION < 0x050000
     QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
+#endif
 
     MainWindow mainWin;
     mainWin.show();