Imported Upstream version 16.6.0~ds0

1 files changed, 22 insertions, 11 deletions

diff --git a/src/smplayer.cpp b/src/smplayer.cpp
index 2083cd6..f23ee53 100644
--- a/src/smplayer.cpp
+++ b/src/smplayer.cpp
@@ -60,6 +60,10 @@
 #include "version.h"
 #endif
 
+#ifdef HDPI_SUPPORT
+#include "hdpisupport.h"
+#endif
+
 using namespace Global;
 
 BaseGui * SMPlayer::main_window = 0;
@@ -583,18 +587,21 @@ void SMPlayer::showInfo() {
 	qDebug("%s", s.toUtf8().data() );
 	qDebug("Compiled with Qt v. %s, using %s", QT_VERSION_STR, qVersion());
 
-	qDebug(" * application path: '%s'", Paths::appPath().toUtf8().data());
-	qDebug(" * data path: '%s'", Paths::dataPath().toUtf8().data());
-	qDebug(" * translation path: '%s'", Paths::translationPath().toUtf8().data());
-	qDebug(" * doc path: '%s'", Paths::docPath().toUtf8().data());
-	qDebug(" * themes path: '%s'", Paths::themesPath().toUtf8().data());
-	qDebug(" * shortcuts path: '%s'", Paths::shortcutsPath().toUtf8().data());
-	qDebug(" * config path: '%s'", Paths::configPath().toUtf8().data());
-	qDebug(" * ini path: '%s'", Paths::iniPath().toUtf8().data());
-	qDebug(" * file for subtitles' styles: '%s'", Paths::subtitleStyleFile().toUtf8().data());
-	qDebug(" * current path: '%s'", QDir::currentPath().toUtf8().data());
+	qDebug() << " * application path:" << Paths::appPath();
+	qDebug() << " * data path:" << Paths::dataPath();
+	qDebug() << " * translation path:" << Paths::translationPath();
+	qDebug() << " * doc path:" << Paths::docPath();
+	qDebug() << " * themes path:" << Paths::themesPath();
+	qDebug() << " * shortcuts path:" << Paths::shortcutsPath();
+	qDebug() << " * config path:" << Paths::configPath();
+	qDebug() << " * ini path:" << Paths::iniPath();
+#if defined(HDPI_SUPPORT) && defined(HDPI_STORE_DATA)
+	qDebug() << " * hdpi ini file:" << HDPISupport::instance()->iniFile();
+#endif
+	qDebug() << " * file for subtitles' styles:" << Paths::subtitleStyleFile();
+	qDebug() << " * current path:" << QDir::currentPath();
 #ifdef FONTS_HACK
-	qDebug(" * font path: '%s'", Paths::fontPath().toUtf8().data());
+	qDebug() << " * font path:" << Paths::fontPath();
 #endif
 }
 
@@ -658,6 +665,10 @@ void SMPlayer::myMessageOutput( QtMsgType type, const char *msg ) {
 			#endif
 			line2 = "CRITICAL: " + orig_line;
 			break;
+		#if QT_VERSION >= 0x050500
+		case QtInfoMsg:
+			break;
+		#endif
 	}
 
 	if (line2.isEmpty()) return;